Commit 520d5649 authored Oct 31, 2018 by Frieder Schrempf Committed by Greg Kroah-Hartman Nov 23, 2018

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: d69d1694 ("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>

parent 36b05750

drivers/net/usb/smsc95xx.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -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 @@ static int smsc95xx_suspend(struct usb_interface *intf, pm_message_t message)
		*/
		if (ret && PMSG_IS_AUTO(message))
		usbnet_resume(intf);

		if (ret)
		schedule_delayed_work(&pdata->carrier_check,
		CARRIER_CHECK_DELAY);

		return ret;
		}