Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf978145 authored Feb 22, 2013 by Mohammed Shafi Shajakhan Committed by Kalle Valo Mar 05, 2013

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>

parent bc52aab3

drivers/net/wireless/ath/ath6kl/init.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -1569,11 +1569,9 @@ static int __ath6kl_init_hw_start(struct ath6kl *ar)
		goto err_power_off;

		/* Do we need to finish the BMI phase */
		/* FIXME: return error from ath6kl_bmi_done() */
		if (ath6kl_bmi_done(ar)) {
		ret = -EIO;
		ret = ath6kl_bmi_done(ar);
		if (ret)
		goto err_power_off;
		}

		/*
		* The reason we have to wait for the target here is that the

drivers/net/wireless/ath/ath6kl/sdio.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1123,12 +1123,14 @@ static int ath6kl_sdio_bmi_write(struct ath6kl ar, u8 buf, u32 len)

		ret = ath6kl_sdio_read_write_sync(ar, addr, buf, len,
		HIF_WR_SYNC_BYTE_INC);
		if (ret)
		if (ret) {
		ath6kl_err("unable to send the bmi data to the device\n");

		return ret;
		}

		return 0;
		}

		static int ath6kl_sdio_bmi_read(struct ath6kl ar, u8 buf, u32 len)
		{
		int ret;