diff options
| author | Frieder Schrempf <frieder.schrempf@kontron.de> | 2018-10-31 22:52:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-11-23 08:17:07 +0100 |
| commit | 520d56492bb882094e1b39f155b876233fe5d4da (patch) | |
| tree | 95ec8ba41362b2326377f015164dd204cd0ec6e2 | |
| parent | 36b0575076d57aadf15feea1a249b6d3a353e5aa (diff) | |
| download | linux-stable-520d56492bb882094e1b39f155b876233fe5d4da.tar.gz linux-stable-520d56492bb882094e1b39f155b876233fe5d4da.tar.bz2 linux-stable-520d56492bb882094e1b39f155b876233fe5d4da.zip | |
usbnet: smsc95xx: disable carrier check while suspending
[ Upstream commit 7b900ead6cc66b2ee873cb042dfba169aa68b56c ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 5974478b5be4..f2d01cb6f958 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c @@ -1600,6 +1600,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; @@ -1842,6 +1844,11 @@ done: */ if (ret && PMSG_IS_AUTO(message)) usbnet_resume(intf); + + if (ret) + schedule_delayed_work(&pdata->carrier_check, + CARRIER_CHECK_DELAY); + return ret; } |