From: Arik Nemtsov <arik@wizery.com>
Date: Thu, 10 May 2012 09:13:47 +0000 (+0300)
Subject: wl18xx: don't upload NVS to FW
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2f1d74e6e7f26df2665b7df5ff912bc1d3ae75dc;p=linux-beck.git

wl18xx: don't upload NVS to FW

In this chip family the NVS file should not be uploaded to FW. In fact,
we encounter strange bugs (sdio errors) when trying to upload it with
certain parameters.

Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
---

diff --git a/drivers/net/wireless/ti/wl18xx/main.c b/drivers/net/wireless/ti/wl18xx/main.c
index a8b9ceacd9c2..ddd11d00f033 100644
--- a/drivers/net/wireless/ti/wl18xx/main.c
+++ b/drivers/net/wireless/ti/wl18xx/main.c
@@ -755,10 +755,6 @@ static int wl18xx_boot(struct wl1271 *wl)
 	if (ret < 0)
 		goto out;
 
-	ret = wlcore_boot_upload_nvs(wl);
-	if (ret < 0)
-		goto out;
-
 	wl18xx_pre_upload(wl);
 
 	ret = wlcore_boot_upload_firmware(wl);