lkml.org 
[lkml]   [2021]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH net v2 2/2] gve: Propagate error codes to caller
On Thu, Jul 1, 2021 at 1:18 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> 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>

> ---
> v2: Unchanged
> The previous serie had 3 patches. Now their are only 2
> ---
> drivers/net/ethernet/google/gve/gve_main.c | 5 +++--
> 1 file 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 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> abort_with_enabled:
> pci_disable_device(pdev);
> - return -ENXIO;
> + return err;
> }
>
> static void gve_remove(struct pci_dev *pdev)
> --
> 2.30.2
>

Thanks for the fix!

\
 
 \ /
  Last update: 2022-09-17 16:10    [W:0.053 / U:0.412 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site