aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1251.c
diff options
context:
space:
mode:
authorKalle Valo <kalle.valo@nokia.com>2009-06-12 14:16:32 +0300
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 14:57:47 -0400
commitc5483b71936333ba9474f57d0f3a7a7abf9b87a0 (patch)
tree599a485034698c38a2071528a0c57f5f547d152a /drivers/net/wireless/wl12xx/wl1251.c
parent01d9cfbdaadc64a46b57437c989bbad241074135 (diff)
wl12xx: check if elp wakeup failed
Check the return call from wl12xx_ps_elp_wakeup() and bail out if it fails. This shouldn't happen, but if does there's a fundamental low level issue. Signed-off-by: Kalle Valo <kalle.valo@nokia.com> Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Vidhya Govindan <vidhya.govindan@nokia.com> Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251.c b/drivers/net/wireless/wl12xx/wl1251.c
index 903624a540a..5f6e75c6112 100644
--- a/drivers/net/wireless/wl12xx/wl1251.c
+++ b/drivers/net/wireless/wl12xx/wl1251.c
@@ -401,6 +401,7 @@ static void wl1251_irq_work(struct work_struct *work)
u32 intr;
struct wl12xx *wl =
container_of(work, struct wl12xx, irq_work);
+ int ret;
mutex_lock(&wl->mutex);
@@ -409,7 +410,9 @@ static void wl1251_irq_work(struct work_struct *work)
if (wl->state == WL12XX_STATE_OFF)
goto out;
- wl12xx_ps_elp_wakeup(wl);
+ ret = wl12xx_ps_elp_wakeup(wl);
+ if (ret < 0)
+ goto out;
wl12xx_reg_write32(wl, ACX_REG_INTERRUPT_MASK, WL1251_ACX_INTR_ALL);
@@ -489,6 +492,7 @@ static void wl1251_irq_work(struct work_struct *work)
out_sleep:
wl12xx_ps_elp_sleep(wl);
+
out:
mutex_unlock(&wl->mutex);
}