diff options
| author |   hayeswang <hayeswang@realtek.com> | 2014-11-12 10:05:05 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-12 14:49:08 -0500 |
| commit | a1f83feecc9e754eac5286844e7d7dcc58a0aceb (patch) | |
| tree | 0ce6d6b85118b8a9c602560099d12437c50dff19 /drivers | |
| parent | r8152: clear the flag of SCHEDULE_TASKLET in tasklet (diff) | |
| download | linux-dev-a1f83feecc9e754eac5286844e7d7dcc58a0aceb.tar.xz linux-dev-a1f83feecc9e754eac5286844e7d7dcc58a0aceb.zip | |
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')
| -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) { 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; |