diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/ethernet/renesas/sh_eth.c | 5 | ||||
-rw-r--r-- | drivers/net/ntb_netdev.c | 2 | ||||
-rw-r--r-- | drivers/net/usb/usbnet.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 33dc6f2418f2..42e9dd05c936 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c | |||
@@ -2745,11 +2745,6 @@ static int sh_eth_drv_probe(struct platform_device *pdev) | |||
2745 | if (mdp->cd->tsu) { | 2745 | if (mdp->cd->tsu) { |
2746 | struct resource *rtsu; | 2746 | struct resource *rtsu; |
2747 | rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1); | 2747 | rtsu = platform_get_resource(pdev, IORESOURCE_MEM, 1); |
2748 | if (!rtsu) { | ||
2749 | dev_err(&pdev->dev, "Not found TSU resource\n"); | ||
2750 | ret = -ENODEV; | ||
2751 | goto out_release; | ||
2752 | } | ||
2753 | mdp->tsu_addr = devm_ioremap_resource(&pdev->dev, rtsu); | 2748 | mdp->tsu_addr = devm_ioremap_resource(&pdev->dev, rtsu); |
2754 | if (IS_ERR(mdp->tsu_addr)) { | 2749 | if (IS_ERR(mdp->tsu_addr)) { |
2755 | ret = PTR_ERR(mdp->tsu_addr); | 2750 | ret = PTR_ERR(mdp->tsu_addr); |
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index ed947dd76fbd..f3cdf64997d6 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c | |||
@@ -375,6 +375,8 @@ static void ntb_netdev_remove(struct pci_dev *pdev) | |||
375 | if (dev == NULL) | 375 | if (dev == NULL) |
376 | return; | 376 | return; |
377 | 377 | ||
378 | list_del(&dev->list); | ||
379 | |||
378 | ndev = dev->ndev; | 380 | ndev = dev->ndev; |
379 | 381 | ||
380 | unregister_netdev(ndev); | 382 | unregister_netdev(ndev); |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index f95cb032394b..06ee82f557d4 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
@@ -1477,7 +1477,7 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod) | |||
1477 | 1477 | ||
1478 | /* usbnet already took usb runtime pm, so have to enable the feature | 1478 | /* usbnet already took usb runtime pm, so have to enable the feature |
1479 | * for usb interface, otherwise usb_autopm_get_interface may return | 1479 | * for usb interface, otherwise usb_autopm_get_interface may return |
1480 | * failure if USB_SUSPEND(RUNTIME_PM) is enabled. | 1480 | * failure if RUNTIME_PM is enabled. |
1481 | */ | 1481 | */ |
1482 | if (!driver->supports_autosuspend) { | 1482 | if (!driver->supports_autosuspend) { |
1483 | driver->supports_autosuspend = 1; | 1483 | driver->supports_autosuspend = 1; |