diff options
| author | hayeswang <hayeswang@realtek.com> | 2017-06-13 15:14:40 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-16 11:37:13 -0400 |
| commit | bd8829822204debbb2dd38a5b052ef7663e618cc (patch) | |
| tree | 12f9199896a4413b366ca7082bb01deec4562a21 | |
| parent | 21cbd0ecad7943bbd4f7d10efaade0380637d4a0 (diff) | |
| download | linux-stable-bd8829822204debbb2dd38a5b052ef7663e618cc.tar.gz linux-stable-bd8829822204debbb2dd38a5b052ef7663e618cc.tar.bz2 linux-stable-bd8829822204debbb2dd38a5b052ef7663e618cc.zip | |
r8152: move calling delay_autosuspend function
Move calling delay_autosuspend() in rtl8152_runtime_suspend(). Calling
delay_autosuspend() as late as possible.
The original flows are
1. check if the driver/device is busy now.
2. set wake events.
3. enter runtime suspend.
If the wake event occurs between (1) and (2), the device may miss it. Besides,
to avoid the runtime resume occurs after runtime suspend immediately, move the
checking to the end of rtl8152_runtime_suspend().
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index c7663e10707c..8bc4573e0cd4 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -4355,13 +4355,6 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) if (netif_running(netdev) && test_bit(WORK_ENABLE, &tp->flags)) { u32 rcr = 0; - if (delay_autosuspend(tp)) { - clear_bit(SELECTIVE_SUSPEND, &tp->flags); - smp_mb__after_atomic(); - ret = -EBUSY; - goto out1; - } - if (netif_carrier_ok(netdev)) { u32 ocp_data; @@ -4395,6 +4388,11 @@ static int rtl8152_runtime_suspend(struct r8152 *tp) ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, rcr); napi_enable(napi); } + + if (delay_autosuspend(tp)) { + rtl8152_runtime_resume(tp); + ret = -EBUSY; + } } out1: |