From: Wei-Ning Huang <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit 9a01242dc7fc4d5fe3f722afbf35b33aa414cd2f upstream. In some case, the btmrvl_sdio firmware would fail to active within the polling time. Increase the polling interval to 100 msec to fix the issue. Signed-off-by: Wei-Ning Huang <[email protected]> Signed-off-by: Wei-Ning Huang <[email protected]> Signed-off-by: Marcel Holtmann <[email protected]> Cc: Oliver Neukum <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- drivers/bluetooth/btmrvl_sdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 00da6df9f71e..65c5f256a5d5 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -269,7 +269,7 @@ static int btmrvl_sdio_verify_fw_download(struct btmrvl_sdio_card *card, if (firmwarestat == FIRMWARE_READY) return 0; - msleep(10); + msleep(100); } return -ETIMEDOUT; -- 2.9.0
