summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_io.h
diff options
context:
space:
mode:
authorOhad Ben-Cohen <ohad@wizery.com>2010-09-16 01:22:04 +0200
committerJohn W. Linville <linville@tuxdriver.com>2010-09-21 11:04:56 -0400
commit2cc78ff78c0af502b040d4527212e29e02d3231d (patch)
treef056210964e0d5799027f900dec47aa10572599a /drivers/net/wireless/wl12xx/wl1271_io.h
parentc1f9a095600e07fefe64eb94eb711f410100824a (diff)
wl1271: propagate set_power's return value
Make it possible for the set power method to indicate a success/failure return value. This is needed to support more complex power on/off operations such as SDIO power manipulations. Signed-off-by: Ohad Ben-Cohen <ohad@wizery.com> Acked-by: Luciano Coelho <luciano.coelho@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_io.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_io.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_io.h b/drivers/net/wireless/wl12xx/wl1271_io.h
index bc806c74c63..c1f92e65ded 100644
--- a/drivers/net/wireless/wl12xx/wl1271_io.h
+++ b/drivers/net/wireless/wl12xx/wl1271_io.h
@@ -144,10 +144,13 @@ static inline void wl1271_power_off(struct wl1271 *wl)
clear_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
}
-static inline void wl1271_power_on(struct wl1271 *wl)
+static inline int wl1271_power_on(struct wl1271 *wl)
{
- wl->if_ops->power(wl, true);
- set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
+ int ret = wl->if_ops->power(wl, true);
+ if (ret == 0)
+ set_bit(WL1271_FLAG_GPIO_POWER, &wl->flags);
+
+ return ret;
}