brcmfmac: verify result of brcmf_sdio_addrprep() calls

Not all calls to the function brcmf_sdio_addrprep() check
the return value, but it may fail so better verify it.

Reviewed-by: Franky Lin <frankyl@broadcom.com>
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
index da0281625e9e7ed327a0625cf141ac0b9a13eab7..c88e26703b901673a3dc61a7f1768e17f0805942 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c
@@ -238,7 +238,9 @@ brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
                func_num = SDIO_FUNC_1;
                reg_size = 4;
 
-               brcmf_sdio_addrprep(sdiodev, reg_size, &addr);
+               ret = brcmf_sdio_addrprep(sdiodev, reg_size, &addr);
+               if (ret)
+                       goto done;
        }
 
        do {
@@ -254,6 +256,7 @@ brcmf_sdio_regrw_helper(struct brcmf_sdio_dev *sdiodev, u32 addr,
                                                       func_num, addr, data, 4);
        } while (ret != 0 && retry++ < SDIOH_API_ACCESS_RETRY_LIMIT);
 
+done:
        if (ret != 0)
                brcmf_err("failed with %d\n", ret);
 
@@ -605,9 +608,10 @@ brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
        memcpy(mypkt->data, buf, nbytes);
 
        width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
-       brcmf_sdio_addrprep(sdiodev, width, &addr);
+       err = brcmf_sdio_addrprep(sdiodev, width, &addr);
 
-       err = brcmf_sdio_buffrw(sdiodev, fn, true, addr, mypkt);
+       if (!err)
+               err = brcmf_sdio_buffrw(sdiodev, fn, true, addr, mypkt);
 
        brcmu_pkt_buf_free_skb(mypkt);
        return err;
@@ -619,12 +623,15 @@ brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
                      uint flags, struct sk_buff_head *pktq)
 {
        uint width;
+       int err;
 
        brcmf_dbg(SDIO, "fun = %d, addr = 0x%x, size = %d\n",
                  fn, addr, pktq->qlen);
 
        width = (flags & SDIO_REQ_4BYTE) ? 4 : 2;
-       brcmf_sdio_addrprep(sdiodev, width, &addr);
+       err = brcmf_sdio_addrprep(sdiodev, width, &addr);
+       if (err)
+               return err;
 
        if (pktq->qlen == 1)
                return brcmf_sdio_buffrw(sdiodev, fn, true, addr, pktq->next);