diff options
| author |   Ido Yariv <ido@wizery.com> | 2012-06-18 18:15:50 +0300 |
|---|---|---|
| committer |   Luciano Coelho <coelho@ti.com> | 2012-06-22 10:49:45 +0300 |
| commit | 2b80040782af56e1b13ad451f593dd4e1875b2b8 (patch) | |
| tree | 267fe2a51b764532c57f97c0cc280c07169dd87c /drivers/net/wireless/ti/wlcore/io.h | |
| parent | wlcore: Propagate errors from wl1271_raw_write32 (diff) | |
| download | linux-dev-2b80040782af56e1b13ad451f593dd4e1875b2b8.tar.xz linux-dev-2b80040782af56e1b13ad451f593dd4e1875b2b8.zip | |
wlcore: Propagate errors from wl1271_read_hwaddr
Propagate errors from wl1271_read_hwaddr. This function is only used
when reading the FW log (following a recovery), so don't read the FW log
in case of a bus error.
Also rename prefixes of wlcore functions which their prototypes had to
be changed.
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/io.h b/drivers/net/wireless/ti/wlcore/io.h index 5e4a3d174004..4a6688b03aea 100644 --- a/drivers/net/wireless/ti/wlcore/io.h +++ b/drivers/net/wireless/ti/wlcore/io.h @@ -131,7 +131,7 @@ static inline int wlcore_read_data(struct wl1271 *wl, int reg, void *buf, return wlcore_read(wl, wl->rtable[reg], buf, len, fixed); } -static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr, +static inline int wlcore_read_hwaddr(struct wl1271 *wl, int hwaddr, void *buf, size_t len, bool fixed) { int physical; @@ -142,7 +142,7 @@ static inline void wl1271_read_hwaddr(struct wl1271 *wl, int hwaddr, physical = wlcore_translate_addr(wl, addr); - wlcore_raw_read(wl, physical, buf, len, fixed); + return wlcore_raw_read(wl, physical, buf, len, fixed); } static inline int wlcore_read32(struct wl1271 *wl, int addr, u32 *val) |