diff options
| author |   Ido Yariv <ido@wizery.com> | 2012-06-17 21:59:42 +0300 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-06-22 10:46:34 +0300 |
| commit | 8b7c0fc3569693c3a68103b7d5a7dad5b84109bc (patch) | |
| tree | 4845b94cb199d9747c9495b8ffd5bb0f2dc83e95 /drivers/net/wireless/ti/wlcore/io.h | |
| parent | wlcore: Change raw io functions to return errors (diff) | |
| download | linux-dev-8b7c0fc3569693c3a68103b7d5a7dad5b84109bc.tar.xz linux-dev-8b7c0fc3569693c3a68103b7d5a7dad5b84109bc.zip | |
wlcore: Propagate errors from wlcore_raw_*_data functions
wlcore_raw_read_data is called when the FW status is read which happens
while handling interrupts and when the FW log is read following a
recovery. Request a recovery in the former case, and don't read the FW
log in case the FW status read failed.
Signed-off-by: Ido Yariv <ido@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/io.h')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/io.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h index 60b95033cdde..2713ce11e21b 100644 --- a/drivers/net/wireless/ti/wlcore/io.h +++ b/drivers/net/wireless/ti/wlcore/io.h @@ -65,16 +65,16 @@ static inline int wlcore_raw_read(struct wl1271 *wl, int addr, void *buf, return wl->if_ops->read(wl->dev, addr, buf, len, fixed); } -static inline void wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf, - size_t len, bool fixed) +static inline int wlcore_raw_read_data(struct wl1271 *wl, int reg, void *buf, + size_t len, bool fixed) { - wlcore_raw_read(wl, wl->rtable[reg], buf, len, fixed); + return wlcore_raw_read(wl, wl->rtable[reg], buf, len, fixed); } -static inline void wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf, - size_t len, bool fixed) +static inline int wlcore_raw_write_data(struct wl1271 *wl, int reg, void *buf, + size_t len, bool fixed) { - wlcore_raw_write(wl, wl->rtable[reg], buf, len, fixed); + return wlcore_raw_write(wl, wl->rtable[reg], buf, len, fixed); } static inline u32 wl1271_raw_read32(struct wl1271 *wl, int addr) |