summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAniket Nagarnaik <aniketn@marvell.com>2015-08-06 03:43:09 -0700
committerMarcel Holtmann <marcel@holtmann.org>2015-08-10 20:41:34 +0200
commit4863e4cc31d647e11f69e1f4d37a870ff3094fcc (patch)
tree3b6cbc79ae96df0fdd8a8ff3b91717fa7ded1d5f
parent0208bc8803918d7e84f247f1d4f1730171a24c16 (diff)
downloadlinux-4863e4cc31d647e11f69e1f4d37a870ff3094fcc.tar.bz2
Bluetooth: btmrvl: release sdio bus after firmware is up
We will not release sdio bus until firmware is completely downloaded and becomes ready. Our 8887 A2 chip can have separate firmware images for WLAN and bluetooth. This patch fixes an issue observed when both drivers simultaneously try to download respective firmwares. Signed-off-by: Aniket Nagarnaik <aniketn@marvell.com> Signed-off-by: Amitkumar Karwar <akarwar@marvell.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--drivers/bluetooth/btmrvl_sdio.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c
index b9a811900f6a..7c097629e593 100644
--- a/drivers/bluetooth/btmrvl_sdio.c
+++ b/drivers/bluetooth/btmrvl_sdio.c
@@ -1071,8 +1071,6 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
}
}
- sdio_release_host(card->func);
-
/*
* winner or not, with this test the FW synchronizes when the
* module can continue its initialization
@@ -1082,6 +1080,8 @@ static int btmrvl_sdio_download_fw(struct btmrvl_sdio_card *card)
return -ETIMEDOUT;
}
+ sdio_release_host(card->func);
+
return 0;
done: