| From foo@baz Wed Nov 21 13:17:56 CET 2018 |
| From: Frieder Schrempf <frieder.schrempf@kontron.de> |
| Date: Wed, 31 Oct 2018 22:52:19 +0100 |
| Subject: usbnet: smsc95xx: disable carrier check while suspending |
| |
| From: Frieder Schrempf <frieder.schrempf@kontron.de> |
| |
| [ 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> |
| --- |
| drivers/net/usb/smsc95xx.c | 7 +++++++ |
| 1 file changed, 7 insertions(+) |
| |
| --- a/drivers/net/usb/smsc95xx.c |
| +++ b/drivers/net/usb/smsc95xx.c |
| @@ -1590,6 +1590,8 @@ static int smsc95xx_suspend(struct usb_i |
| 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; |
| @@ -1832,6 +1834,11 @@ done: |
| */ |
| if (ret && PMSG_IS_AUTO(message)) |
| usbnet_resume(intf); |
| + |
| + if (ret) |
| + schedule_delayed_work(&pdata->carrier_check, |
| + CARRIER_CHECK_DELAY); |
| + |
| return ret; |
| } |
| |
