From patchwork Mon Nov 30 17:13:20 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Lennert Buytenhek <buytenh@wantstofly.org>
X-Patchwork-Id: 63733
Received: from vger.kernel.org (vger.kernel.org [209.132.176.167])
	by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nAUHD63b017604
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Mon, 30 Nov 2009 17:13:22 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752961AbZK3RNP (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Mon, 30 Nov 2009 12:13:15 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752608AbZK3RNO
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Mon, 30 Nov 2009 12:13:14 -0500
Received: from fw.wantstofly.org ([80.101.37.227]:57157 "EHLO
	mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752601AbZK3RNO (ORCPT
	<rfc822;linux-wireless@vger.kernel.org>);
	Mon, 30 Nov 2009 12:13:14 -0500
Received: by mail.wantstofly.org (Postfix, from userid 500)
	id 9449818E201; Mon, 30 Nov 2009 18:13:20 +0100 (CET)
Date: Mon, 30 Nov 2009 18:13:20 +0100
From: Lennert Buytenhek <buytenh@wantstofly.org>
To: "John W. Linville" <linville@tuxdriver.com>,
	linux-wireless@vger.kernel.org
Subject: [PATCH 08/12] mwl8k: increase firmware loading timeouts
Message-ID: <20091130171320.GK20214@mail.wantstofly.org>
Mime-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.4.2.2i
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c
index 8f7546f..b3eba35 100644
--- a/drivers/net/wireless/mwl8k.c
+++ b/drivers/net/wireless/mwl8k.c
@@ -571,7 +571,7 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
 			       "helper image\n", pci_name(priv->pdev));
 			return rc;
 		}
-		msleep(1);
+		msleep(5);
 
 		rc = mwl8k_feed_fw_image(priv, fw->data, fw->size);
 	} else {
@@ -588,9 +588,8 @@ static int mwl8k_load_firmware(struct ieee80211_hw *hw)
 		iowrite32(MWL8K_MODE_AP, priv->regs + MWL8K_HIU_GEN_PTR);
 	else
 		iowrite32(MWL8K_MODE_STA, priv->regs + MWL8K_HIU_GEN_PTR);
-	msleep(1);
 
-	loops = 200000;
+	loops = 500000;
 	do {
 		u32 ready_code;