Fix build of brcmfmac
diff --git a/queue-3.16/brcmfmac-abort-and-release-host-after-error.patch b/queue-3.16/brcmfmac-abort-and-release-host-after-error.patch
index 652665c..5700703 100644
--- a/queue-3.16/brcmfmac-abort-and-release-host-after-error.patch
+++ b/queue-3.16/brcmfmac-abort-and-release-host-after-error.patch
@@ -31,21 +31,22 @@
 Acked-by: franky.lin@broadcom.com
 Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
 Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+[bwh: Backported to 3.16:
+ - Use bus->sdiodev->func[1] instead of ->func1
+ - Adjust filename]
 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
 ---
- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 ++
+ drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-index f9047db6a11d..3a08252f1a53 100644
---- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
-@@ -1938,6 +1938,8 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
+--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
++++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+@@ -1971,6 +1971,8 @@ static uint brcmf_sdio_readframes(struct
  			if (brcmf_sdio_hdparse(bus, bus->rxhdr, &rd_new,
  					       BRCMF_SDIO_FT_NORMAL)) {
  				rd->len = 0;
 +				brcmf_sdio_rxfail(bus, true, true);
-+				sdio_release_host(bus->sdiodev->func1);
++				sdio_release_host(bus->sdiodev->func[1]);
  				brcmu_pkt_buf_free_skb(pkt);
  				continue;
  			}