OSDN Git Service

staging: qlge: fix an error code in probe()
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 22 Mar 2021 15:06:49 +0000 (18:06 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 22 Mar 2021 16:11:26 +0000 (17:11 +0100)
If alloc_etherdev_mq() fails then return -ENOMEM instead of success.
The "err = 0;" triggers an unused assignment now so remove that as
well.

Fixes: 953b94009377 ("staging: qlge: Initialize devlink health dump framework")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Link: https://lore.kernel.org/r/YFiyicHI189PXrha@mwanda
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/qlge/qlge_main.c

index 2682a0e..e114709 100644 (file)
@@ -4549,7 +4549,7 @@ static int qlge_probe(struct pci_dev *pdev,
        struct net_device *ndev = NULL;
        struct devlink *devlink;
        static int cards_found;
-       int err = 0;
+       int err;
 
        devlink = devlink_alloc(&qlge_devlink_ops, sizeof(struct qlge_adapter));
        if (!devlink)
@@ -4560,8 +4560,10 @@ static int qlge_probe(struct pci_dev *pdev,
        ndev = alloc_etherdev_mq(sizeof(struct qlge_netdev_priv),
                                 min(MAX_CPUS,
                                     netif_get_num_default_rss_queues()));
-       if (!ndev)
+       if (!ndev) {
+               err = -ENOMEM;
                goto devlink_free;
+       }
 
        ndev_priv = netdev_priv(ndev);
        ndev_priv->qdev = qdev;