From 59f5a65d18f1143442a80371daf619e1bd076fa6 Mon Sep 17 00:00:00 2001 From: Arik Nemtsov Date: Mon, 25 Jun 2012 22:26:20 +0300 Subject: [PATCH] --- yaml --- r: 315315 b: refs/heads/master c: b034fd6f4fa272569324bb3f29af5ca7cf1e23c3 h: refs/heads/master i: 315313: 346930434cd3b66cc3d17f664b94174a3fc93845 315311: c572d40e2b347c27b96ccf6c01d424f26726ca6c v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3fec7b3af75b..8268658ce211 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aafec111dd2b74f2ec0f55f0c79144f6558d9205 +refs/heads/master: b034fd6f4fa272569324bb3f29af5ca7cf1e23c3 diff --git a/trunk/drivers/net/wireless/ti/wlcore/main.c b/trunk/drivers/net/wireless/ti/wlcore/main.c index c5b8c5cadae6..1590a1ce4abd 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/main.c +++ b/trunk/drivers/net/wireless/ti/wlcore/main.c @@ -926,7 +926,6 @@ static void wl1271_recovery_work(struct work_struct *work) if (no_recovery) { wl1271_info("No recovery (chosen on module load). Fw will remain stuck."); - clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); goto out_unlock; } @@ -970,7 +969,8 @@ static void wl1271_recovery_work(struct work_struct *work) wlcore_wake_queues(wl, WLCORE_QUEUE_STOP_REASON_FW_RESTART); return; out_unlock: - wl->watchdog_recovery = false; + wl->watchdog_recovery = false; + clear_bit(WL1271_FLAG_RECOVERY_IN_PROGRESS, &wl->flags); mutex_unlock(&wl->mutex); }