From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932773AbcFOHeG (ORCPT ); Wed, 15 Jun 2016 03:34:06 -0400 Received: from mx2.suse.de ([195.135.220.15]:34272 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932651AbcFOHbm (ORCPT ); Wed, 15 Jun 2016 03:31:42 -0400 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Wei-Ning Huang , Wei-Ning Huang , Marcel Holtmann , Oliver Neukum , Jiri Slaby Subject: [PATCH 3.12 55/56] Bluetooth: btmrvl_sdio: fix firmware activation failure Date: Wed, 15 Jun 2016 09:31:19 +0200 Message-Id: <2e521b636e32f707aef4f46ff4ac4169e65ed8cb.1465975780.git.jslaby@suse.cz> X-Mailer: git-send-email 2.9.0 In-Reply-To: <352d108e14e126b7dfb5fbecde3dc78be62a5ce5.1465975780.git.jslaby@suse.cz> References: <352d108e14e126b7dfb5fbecde3dc78be62a5ce5.1465975780.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Wei-Ning Huang 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 Signed-off-by: Wei-Ning Huang Signed-off-by: Marcel Holtmann Cc: Oliver Neukum Signed-off-by: Jiri Slaby --- 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