diff options
author | Ido Yariv <ido@wizery.com> | 2012-06-18 11:31:16 +0200 |
---|---|---|
committer | Luciano Coelho <coelho@ti.com> | 2012-06-22 09:46:34 +0200 |
commit | 045b9b5f4172b2b21af0b9bf5e6dda51146d51a4 (patch) | |
tree | c07a8fcc85ea8fd0d7735782499f2f91d6a2fd6f /drivers/net/wireless/ti/wl12xx | |
parent | wlcore: Propagate errors from wlcore_raw_*_data functions (diff) | |
download | linux-045b9b5f4172b2b21af0b9bf5e6dda51146d51a4.tar.xz linux-045b9b5f4172b2b21af0b9bf5e6dda51146d51a4.zip |
wlcore: Propagate errors from wl1271_read
Propagate errors from wl1271_read and request for recovery when
appropriate.
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/wl12xx')
-rw-r--r-- | drivers/net/wireless/ti/wl12xx/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/main.c b/drivers/net/wireless/ti/wl12xx/main.c index 0d2fdca2aa32..916cee76b37f 100644 --- a/drivers/net/wireless/ti/wl12xx/main.c +++ b/drivers/net/wireless/ti/wl12xx/main.c @@ -1162,13 +1162,13 @@ static u32 wl12xx_get_rx_packet_len(struct wl1271 *wl, void *rx_data, return data_len - sizeof(*desc) - desc->pad_len; } -static void wl12xx_tx_delayed_compl(struct wl1271 *wl) +static int wl12xx_tx_delayed_compl(struct wl1271 *wl) { if (wl->fw_status_1->tx_results_counter == (wl->tx_results_count & 0xff)) - return; + return 0; - wl1271_tx_complete(wl); + return wlcore_tx_complete(wl); } static int wl12xx_hw_init(struct wl1271 *wl) |