p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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>
This commit is contained in:
Frieder Schrempf 2018-10-31 22:52:19 +01:00 committed by David S. Miller
parent 49682bfa1e
commit 7b900ead6c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/net/usb/smsc95xx.c
View File

@ -1598,6 +1598,8 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
return ret; return ret;
} }
cancel_delayed_work_sync(&pdata->carrier_check);
if (pdata->suspend_flags) { if (pdata->suspend_flags) {
netdev_warn(dev->net, "error during last resume\n"); netdev_warn(dev->net, "error during last resume\n");
pdata->suspend_flags = 0; pdata->suspend_flags = 0;
@ -1840,6 +1842,11 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
*/ */
if (ret && PMSG_IS_AUTO(message)) if (ret && PMSG_IS_AUTO(message))
usbnet_resume(intf); usbnet_resume(intf);
if (ret)
schedule_delayed_work(&pdata->carrier_check,
CARRIER_CHECK_DELAY);
return ret; return ret;
} }