diff options
author | hayeswang <hayeswang@realtek.com> | 2014-11-11 21:05:05 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-11-12 14:49:08 -0500 |
commit | a1f83feecc9e754eac5286844e7d7dcc58a0aceb (patch) | |
tree | 0ce6d6b85118b8a9c602560099d12437c50dff19 /drivers/net/usb | |
parent | 9451a11c1821c559ddfffc55b4c6ef350205fdbf (diff) |
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 <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/r8152.c | 9 |
1 files changed, 6 insertions, 3 deletions
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) | |||
2857 | { | 2857 | { |
2858 | struct r8152 *tp = container_of(work, struct r8152, schedule.work); | 2858 | struct r8152 *tp = container_of(work, struct r8152, schedule.work); |
2859 | 2859 | ||
2860 | /* If the device is unplugged or !netif_running(), the workqueue | ||
2861 | * doesn't need to wake the device, and could return directly. | ||
2862 | */ | ||
2863 | if (test_bit(RTL8152_UNPLUG, &tp->flags) || !netif_running(tp->netdev)) | ||
2864 | return; | ||
2865 | |||
2860 | if (usb_autopm_get_interface(tp->intf) < 0) | 2866 | if (usb_autopm_get_interface(tp->intf) < 0) |
2861 | return; | 2867 | return; |
2862 | 2868 | ||
2863 | if (!test_bit(WORK_ENABLE, &tp->flags)) | 2869 | if (!test_bit(WORK_ENABLE, &tp->flags)) |
2864 | goto out1; | 2870 | goto out1; |
2865 | 2871 | ||
2866 | if (test_bit(RTL8152_UNPLUG, &tp->flags)) | ||
2867 | goto out1; | ||
2868 | |||
2869 | if (!mutex_trylock(&tp->control)) { | 2872 | if (!mutex_trylock(&tp->control)) { |
2870 | schedule_delayed_work(&tp->schedule, 0); | 2873 | schedule_delayed_work(&tp->schedule, 0); |
2871 | goto out1; | 2874 | goto out1; |