diff options
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 7a8762553cdc..012e1a4016fe 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) | |||
52 | wl->if_ops->disable_irq(wl); | 52 | wl->if_ops->disable_irq(wl); |
53 | } | 53 | } |
54 | 54 | ||
55 | static void wl1251_power_off(struct wl1251 *wl) | 55 | static int wl1251_power_off(struct wl1251 *wl) |
56 | { | 56 | { |
57 | wl->set_power(false); | 57 | return wl->if_ops->power(wl, false); |
58 | } | 58 | } |
59 | 59 | ||
60 | static void wl1251_power_on(struct wl1251 *wl) | 60 | static int wl1251_power_on(struct wl1251 *wl) |
61 | { | 61 | { |
62 | wl->set_power(true); | 62 | return wl->if_ops->power(wl, true); |
63 | } | 63 | } |
64 | 64 | ||
65 | static int wl1251_fetch_firmware(struct wl1251 *wl) | 65 | static int wl1251_fetch_firmware(struct wl1251 *wl) |
@@ -152,9 +152,12 @@ static void wl1251_fw_wakeup(struct wl1251 *wl) | |||
152 | 152 | ||
153 | static int wl1251_chip_wakeup(struct wl1251 *wl) | 153 | static int wl1251_chip_wakeup(struct wl1251 *wl) |
154 | { | 154 | { |
155 | int ret = 0; | 155 | int ret; |
156 | |||
157 | ret = wl1251_power_on(wl); | ||
158 | if (ret < 0) | ||
159 | return ret; | ||
156 | 160 | ||
157 | wl1251_power_on(wl); | ||
158 | msleep(WL1251_POWER_ON_SLEEP); | 161 | msleep(WL1251_POWER_ON_SLEEP); |
159 | wl->if_ops->reset(wl); | 162 | wl->if_ops->reset(wl); |
160 | 163 | ||