From: hayeswang Date: Wed, 12 Nov 2014 02:05:05 +0000 (+0800) Subject: r8152: check RTL8152_UNPLUG and netif_running before autoresume X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a1f83feecc9e754eac5286844e7d7dcc58a0aceb;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git r8152: check RTL8152_UNPLUG and netif_running before autoresume If the device is unplugged or !netif_running(), the workqueue doesn't need to wake the device, and could return directly. Signed-off-by: Hayes Wang Signed-off-by: David S. Miller --- diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index ad9dd7d17508..0a30fd3f673d 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -2857,15 +2857,18 @@ static void rtl_work_func_t(struct work_struct *work) { struct r8152 *tp = container_of(work, struct r8152, schedule.work); + /* If the device is unplugged or !netif_running(), the workqueue + * doesn't need to wake the device, and could return directly. + */ + if (test_bit(RTL8152_UNPLUG, &tp->flags) || !netif_running(tp->netdev)) + return; + if (usb_autopm_get_interface(tp->intf) < 0) return; if (!test_bit(WORK_ENABLE, &tp->flags)) goto out1; - if (test_bit(RTL8152_UNPLUG, &tp->flags)) - goto out1; - if (!mutex_trylock(&tp->control)) { schedule_delayed_work(&tp->schedule, 0); goto out1;