From: John W. Linville <linville@tuxdriver.com>
Date: Fri, 29 Jun 2012 16:42:14 +0000 (-0400)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Tag: firefly_0821_release~3680^2~2381^2~338^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8732baafc3f19e69df683c3f0f36c13cec746fb9;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
---

8732baafc3f19e69df683c3f0f36c13cec746fb9
diff --cc drivers/net/wireless/ti/wlcore/tx.c
index 9273fdb3aaec,6a28aeecf004..8038a5026933
--- a/drivers/net/wireless/ti/wlcore/tx.c
+++ b/drivers/net/wireless/ti/wlcore/tx.c
@@@ -877,15 -910,20 +910,19 @@@ static void wl1271_tx_complete_packet(s
  }
  
  /* Called upon reception of a TX complete interrupt */
- void wl1271_tx_complete(struct wl1271 *wl)
+ int wlcore_tx_complete(struct wl1271 *wl)
  {
 -	struct wl1271_acx_mem_map *memmap =
 -		(struct wl1271_acx_mem_map *)wl->target_mem_map;
 +	struct wl1271_acx_mem_map *memmap = wl->target_mem_map;
  	u32 count, fw_counter;
  	u32 i;
+ 	int ret;
  
  	/* read the tx results from the chipset */
- 	wl1271_read(wl, le32_to_cpu(memmap->tx_result),
- 		    wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+ 	ret = wlcore_read(wl, le32_to_cpu(memmap->tx_result),
+ 			  wl->tx_res_if, sizeof(*wl->tx_res_if), false);
+ 	if (ret < 0)
+ 		goto out;
+ 
  	fw_counter = le32_to_cpu(wl->tx_res_if->tx_result_fw_counter);
  
  	/* write host counter to chipset (to ack) */