diff options
| author | Frieder Schrempf <frieder.schrempf@kontron.de> | 2018-10-31 22:52:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-11-02 23:49:15 -0700 |
| commit | 7b900ead6cc66b2ee873cb042dfba169aa68b56c (patch) | |
| tree | 0bc77a9b29d6e2612104754089386b403c0704b7 /drivers | |
| parent | 49682bfa1e0e448a711471a5db83be0df1fb39a2 (diff) | |
| download | lwn-7b900ead6cc66b2ee873cb042dfba169aa68b56c.tar.gz lwn-7b900ead6cc66b2ee873cb042dfba169aa68b56c.zip | |
usbnet: smsc95xx: disable carrier check while suspending
We need to make sure, that the carrier check polling is disabled
while suspending. Otherwise we can end up with usbnet_read_cmd()
being issued when only usbnet_read_cmd_nopm() is allowed. If this
happens, read operations lock up.
Fixes: d69d169493 ("usbnet: smsc95xx: fix link detection for disabled autonegotiation")
Signed-off-by: Frieder Schrempf <frieder.schrempf@kontron.de>
Reviewed-by: Raghuram Chary J <RaghuramChary.Jallipalli@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/usb/smsc95xx.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 262e7a3c23cb..2d17f3b9bb16 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1598,6 +1598,8 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message) return ret; } + cancel_delayed_work_sync(&pdata->carrier_check); + if (pdata->suspend_flags) { netdev_warn(dev->net, "error during last resume\n"); pdata->suspend_flags = 0; @@ -1840,6 +1842,11 @@ done: */ if (ret && PMSG_IS_AUTO(message)) usbnet_resume(intf); + + if (ret) + schedule_delayed_work(&pdata->carrier_check, + CARRIER_CHECK_DELAY); + return ret; } |