]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
wl12xx: Power off after flushing work
authorIdo Yariv <ido@wizery.com>
Wed, 11 Jan 2012 07:42:40 +0000 (09:42 +0200)
committerLuciano Coelho <coelho@ti.com>
Wed, 15 Feb 2012 06:38:28 +0000 (08:38 +0200)
When stopping plt, the chip is powered off before all current work items
are flushed and interrupts are disabled. This might introduce a race in
which the driver tries to communicate with a powered off chip.

Fix this by powering off the device only after interrupts are disabled
and all work items are flushed.

Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
drivers/net/wireless/wl12xx/main.c

index ac68664690730c02e42cafc4aef355fd167c38fb..9e9fb3fb8f01e697d891bd4b87e833a1620cae0b 100644 (file)
@@ -1406,8 +1406,6 @@ int wl1271_plt_stop(struct wl1271 *wl)
                goto out;
        }
 
-       wl1271_power_off(wl);
-
        wl->state = WL1271_STATE_OFF;
        wl->rx_counter = 0;
 
@@ -1417,6 +1415,11 @@ int wl1271_plt_stop(struct wl1271 *wl)
        wl1271_flush_deferred_work(wl);
        cancel_work_sync(&wl->netstack_work);
        cancel_work_sync(&wl->recovery_work);
+
+       mutex_lock(&wl->mutex);
+       wl1271_power_off(wl);
+       mutex_unlock(&wl->mutex);
+
 out:
        return ret;
 }