diff options
| author | Ido Yariv | 2012-06-18 17:15:50 +0200 |
|---|---|---|
| committer | Luciano Coelho | 2012-06-22 09:49:45 +0200 |
| commit | 2b80040782af56e1b13ad451f593dd4e1875b2b8 (patch) | |
| tree | 267fe2a51b764532c57f97c0cc280c07169dd87c /drivers/net/wireless/ti/wlcore/main.c | |
| parent | wlcore: Propagate errors from wl1271_raw_write32 (diff) | |
| download | kernel-qcow2-linux-2b80040782af56e1b13ad451f593dd4e1875b2b8.tar.gz kernel-qcow2-linux-2b80040782af56e1b13ad451f593dd4e1875b2b8.tar.xz kernel-qcow2-linux-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/main.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index 546fcb074c6e..b0795aac4bac 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c @@ -851,8 +851,10 @@ static void wl12xx_read_fwlog_panic(struct wl1271 *wl) /* Traverse the memory blocks linked list */ do { memset(block, 0, WL12XX_HW_BLOCK_SIZE); - wl1271_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE, - false); + ret = wlcore_read_hwaddr(wl, addr, block, WL12XX_HW_BLOCK_SIZE, + false); + if (ret < 0) + goto out; /* * Memory blocks are linked to one another. The first 4 bytes |