diff options
| author |  Heiner Kallweit <hkallweit1@gmail.com>
| 2017-12-12 07:41:06 +0100 |
|---|---|---|
| committer |  David S. Miller <davem@davemloft.net>
| 2017-12-13 14:51:50 -0500 |
| commit | 4cf964af0a7238f9d9dbebf4ec70a415ff5164e5 (patch) | |
| tree | bf6cdf0f1817f4d0e7e34ef25b42441b9ac10e0a /drivers/net/ethernet/realtek | |
| parent | r8169: switch to device-managed functions in probe (diff) | |
| download | linux-4cf964af0a7238f9d9dbebf4ec70a415ff5164e5.tar.gz linux-4cf964af0a7238f9d9dbebf4ec70a415ff5164e5.tar.bz2 linux-4cf964af0a7238f9d9dbebf4ec70a415ff5164e5.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/realtek')
| -rw-r--r-- | drivers/net/ethernet/realtek/r8169.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c index 3c7d90d3a9cb..857f67bebc6a 100644 --- a/drivers/net/ethernet/realtek/r8169.c +++ b/drivers/net/ethernet/realtek/r8169.c @@ -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 = { |