diff options
| author | David S. Miller <davem@davemloft.net> | 2010-11-16 09:17:12 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-11-16 09:17:12 -0800 |
| commit | b5e4156743c5d42b736936be7a9ee8d72e0e4ac9 (patch) | |
| tree | f0edde33e7b2502ab35a4f63be1a8be31f5f4b6a /drivers/net/wireless/wl1251/main.c | |
| parent | 6b35308850e1679741e8b646cfb7bb3ab5369888 (diff) | |
| parent | b1d771ee33c6e4006676002b9d74abf45b71d3d6 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl1251/main.c')
| -rw-r--r-- | drivers/net/wireless/wl1251/main.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/wl1251/main.c b/drivers/net/wireless/wl1251/main.c index 7a8762553cd..012e1a4016f 100644 --- a/drivers/net/wireless/wl1251/main.c +++ b/drivers/net/wireless/wl1251/main.c @@ -52,14 +52,14 @@ void wl1251_disable_interrupts(struct wl1251 *wl) wl->if_ops->disable_irq(wl); } -static void wl1251_power_off(struct wl1251 *wl) +static int wl1251_power_off(struct wl1251 *wl) { - wl->set_power(false); + return wl->if_ops->power(wl, false); } -static void wl1251_power_on(struct wl1251 *wl) +static int wl1251_power_on(struct wl1251 *wl) { - wl->set_power(true); + return wl->if_ops->power(wl, true); } static int wl1251_fetch_firmware(struct wl1251 *wl) @@ -152,9 +152,12 @@ static void wl1251_fw_wakeup(struct wl1251 *wl) static int wl1251_chip_wakeup(struct wl1251 *wl) { - int ret = 0; + int ret; + + ret = wl1251_power_on(wl); + if (ret < 0) + return ret; - wl1251_power_on(wl); msleep(WL1251_POWER_ON_SLEEP); wl->if_ops->reset(wl); |