diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2018-10-12 09:54:10 +0200 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2018-10-12 09:54:10 +0200 |
| commit | ead87d7eaebab8c085883b7977817d5020d74fc1 (patch) | |
| tree | 61754ede7cd892638580547839261976ff1c1b0a | |
| parent | f4f8f1da403888b1e58d5d7a50ffbc150f1d9c93 (diff) | |
Revert "wlcore: Fix timout errors after recovery"wlcore-next-20181012
This reverts commit 598bfffb593d3fd0e31e790d604b44c9c5df368e.
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 26b187336875..8e447c092435 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -984,8 +984,6 @@ static void wl1271_recovery_work(struct work_struct *work) } wlcore_op_stop_locked(wl); - pm_runtime_mark_last_busy(wl->dev); - pm_runtime_put_autosuspend(wl->dev); ieee80211_restart_hw(wl->hw); @@ -995,6 +993,8 @@ static void wl1271_recovery_work(struct work_struct *work) */ wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART); + pm_runtime_put(wl->dev); + out_unlock: wl->watchdog_recovery = false; clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); |