gve: Fix an error handling path in 'gve_probe()'

If the 'register_netdev() call fails, we must release the resources
allocated by the previous 'gve_init_priv()' call, as already done in the
remove function.

Add a new label and the missing 'gve_teardown_priv_resources()' in the
error handling path.

Fixes: 893ce44df5 ("gve: Add basic driver framework for Compute Engine Virtual NIC")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Catherine Sullivan <csully@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christophe JAILLET 2021-07-01 22:18:24 +02:00 committed by David S. Miller
parent aa3cf240b0
commit 2342ae10d1

View File

@ -1565,7 +1565,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err = register_netdev(dev); err = register_netdev(dev);
if (err) if (err)
goto abort_with_wq; goto abort_with_gve_init;
dev_info(&pdev->dev, "GVE version %s\n", gve_version_str); dev_info(&pdev->dev, "GVE version %s\n", gve_version_str);
dev_info(&pdev->dev, "GVE queue format %d\n", (int)priv->queue_format); dev_info(&pdev->dev, "GVE queue format %d\n", (int)priv->queue_format);
@ -1573,6 +1573,9 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
queue_work(priv->gve_wq, &priv->service_task); queue_work(priv->gve_wq, &priv->service_task);
return 0; return 0;
abort_with_gve_init:
gve_teardown_priv_resources(priv);
abort_with_wq: abort_with_wq:
destroy_workqueue(priv->gve_wq); destroy_workqueue(priv->gve_wq);