aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMohammed Shafi Shajakhan <mohammed@qca.qualcomm.com>2013-02-22 09:50:21 -0500
committerKalle Valo <kvalo@qca.qualcomm.com>2013-03-05 02:41:54 -0500
commitbf9781454731c17085bc4708c09ada50f1b63120 (patch)
treef9475b7098322bb874038fb6098973091884b109
parentbc52aab380c7beb49d20ea6e77e8239b9ffe74a9 (diff)
ath6kl: Return error from ath6kl_bmi_done()
This addresses a FIXME in the driver. Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qca.qualcomm.com> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
-rw-r--r--drivers/net/wireless/ath/ath6kl/init.c6
-rw-r--r--drivers/net/wireless/ath/ath6kl/sdio.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 5d434cf88f35..072a2295eff8 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1569,11 +1569,9 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
1569 goto err_power_off; 1569 goto err_power_off;
1570 1570
1571 /* Do we need to finish the BMI phase */ 1571 /* Do we need to finish the BMI phase */
1572 /* FIXME: return error from ath6kl_bmi_done() */ 1572 ret = ath6kl_bmi_done(ar);
1573 if (ath6kl_bmi_done(ar)) { 1573 if (ret)
1574 ret = -EIO;
1575 goto err_power_off; 1574 goto err_power_off;
1576 }
1577 1575
1578 /* 1576 /*
1579 * The reason we have to wait for the target here is that the 1577 * The reason we have to wait for the target here is that the
diff --git a/drivers/net/wireless/ath/ath6kl/sdio.c b/drivers/net/wireless/ath/ath6kl/sdio.c
index d111980d44c0..0bd8ff69461a 100644
--- a/drivers/net/wireless/ath/ath6kl/sdio.c
+++ b/drivers/net/wireless/ath/ath6kl/sdio.c
@@ -1123,10 +1123,12 @@ static int ath6kl_sdio_bmi_write(struct ath6kl *ar, u8 *buf, u32 len)
1123 1123
1124 ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len, 1124 ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len,
1125 HIF_WR_SYNC_BYTE_INC); 1125 HIF_WR_SYNC_BYTE_INC);
1126 if (ret) 1126 if (ret) {
1127 ath6kl_err("unable to send the bmi data to the device\n"); 1127 ath6kl_err("unable to send the bmi data to the device\n");
1128 return ret;
1129 }
1128 1130
1129 return ret; 1131 return 0;
1130} 1132}
1131 1133
1132static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len) 1134static int ath6kl_sdio_bmi_read(struct ath6kl *ar, u8 *buf, u32 len)