redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

r8169: remove netif_napi_del in probe error path 

netif_napi_del is called implicitely by free_netdev, therefore we
don't have to do it explicitely.

When the probe error path is reached, the net_device isn't
registered yet. Therefore reordering the call to netif_napi_del
shouldn't cause any issues.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Heiner Kallweit 2017-12-12 07:41:06 +01:00 committed by David S. Miller
parent 4c45d24a75
commit 4cf964af0a
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/ethernet/realtek/r8169.c
View File

@ -8672,14 +8672,12 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
tp->counters = dmam_alloc_coherent (&pdev->dev, sizeof(*tp->counters),
&tp->counters_phys_addr,
GFP_KERNEL);
if (!tp->counters) {
rc = -ENOMEM;
goto err_out_msi_5;
}
if (!tp->counters)
return -ENOMEM;
rc = register_netdev(dev);
if (rc < 0)
goto err_out_msi_5;
return rc;
pci_set_drvdata(pdev, dev);
@ -8709,11 +8707,6 @@ static int rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
netif_carrier_off(dev);
return 0;
err_out_msi_5:
netif_napi_del(&tp->napi);
return rc;
}
static struct pci_driver rtl8169_pci_driver = {