diff options
| author |   Christophe JAILLET <christophe.jaillet@wanadoo.fr> | 2021-07-01 22:18:37 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-07-01 15:45:01 -0700 |
| commit | 6dce38b4b7ffb39539b49feca2b3ce34dbaadf02 (patch) | |
| tree | a4604e8c5f510020e258ff7422addff22b31ee56 | |
| parent | gve: Fix an error handling path in 'gve_probe()' (diff) | |
| download | linux-dev-6dce38b4b7ffb39539b49feca2b3ce34dbaadf02.tar.xz linux-dev-6dce38b4b7ffb39539b49feca2b3ce34dbaadf02.zip | |
gve: Propagate error codes to caller
If 'gve_probe()' fails, we should propagate the error code, instead of
hard coding a -ENXIO value.
Make sure that all error handling paths set a correct value for 'err'.
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>
| -rw-r--r-- | drivers/net/ethernet/google/gve/gve_main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c index 44262c9f9ec2..c03984b26db4 100644 --- a/drivers/net/ethernet/google/gve/gve_main.c +++ b/drivers/net/ethernet/google/gve/gve_main.c @@ -1469,7 +1469,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = pci_enable_device(pdev); if (err) - return -ENXIO; + return err; err = pci_request_regions(pdev, "gvnic-cfg"); if (err) @@ -1512,6 +1512,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent) dev = alloc_etherdev_mqs(sizeof(*priv), max_tx_queues, max_rx_queues); if (!dev) { dev_err(&pdev->dev, "could not allocate netdev\n"); + err = -ENOMEM; goto abort_with_db_bar; } SET_NETDEV_DEV(dev, &pdev->dev); @@ -1593,7 +1594,7 @@ abort_with_pci_region: abort_with_enabled: pci_disable_device(pdev); - return -ENXIO; + return err; } static void gve_remove(struct pci_dev *pdev) |