From ad788e483e4b57601ea5abdc841c89d3f3eb25c5 Mon Sep 17 00:00:00 2001
From: Arik Nemtsov <arik@wizery.com>
Date: Thu, 10 May 2012 12:13:47 +0300
Subject: [PATCH] --- yaml --- r: 314088 b: refs/heads/master c:
 2f1d74e6e7f26df2665b7df5ff912bc1d3ae75dc h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/drivers/net/wireless/ti/wl18xx/main.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e348e3f9d187..6359c8c6b8c5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2baf075c5121b30922751f34920815743d7ee67
+refs/heads/master: 2f1d74e6e7f26df2665b7df5ff912bc1d3ae75dc
diff --git a/trunk/drivers/net/wireless/ti/wl18xx/main.c b/trunk/drivers/net/wireless/ti/wl18xx/main.c
index a8b9ceacd9c2..ddd11d00f033 100644
--- a/trunk/drivers/net/wireless/ti/wl18xx/main.c
+++ b/trunk/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);