From 0b7e8fe14dc3e12f05678c185cd38c6f6eb72508 Mon Sep 17 00:00:00 2001
From: Roger Quadros <roger.quadros@nokia.com>
Date: Mon, 29 Nov 2010 16:24:57 +0200
Subject: [PATCH] --- yaml --- r: 225316 b: refs/heads/master c:
 870c367cf829466f315de785ac613dd94eff5c50 h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/net/wireless/wl12xx/boot.c | 17 ++++++++++++++++-
 trunk/drivers/net/wireless/wl12xx/boot.h |  1 +
 trunk/drivers/net/wireless/wl12xx/io.c   |  1 +
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 99bdf9a67ad9..5d083fae20e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43a598d5e40485fcfbebe0700077e83afd803ed5
+refs/heads/master: 870c367cf829466f315de785ac613dd94eff5c50
diff --git a/trunk/drivers/net/wireless/wl12xx/boot.c b/trunk/drivers/net/wireless/wl12xx/boot.c
index 1eafb8175832..4a9f929725fd 100644
--- a/trunk/drivers/net/wireless/wl12xx/boot.c
+++ b/trunk/drivers/net/wireless/wl12xx/boot.c
@@ -467,7 +467,8 @@ static void wl1271_boot_hw_version(struct wl1271 *wl)
 	wl->hw_pg_ver = (s8)fuse;
 }
 
-int wl1271_boot(struct wl1271 *wl)
+/* uploads NVS and firmware */
+int wl1271_load_firmware(struct wl1271 *wl)
 {
 	int ret = 0;
 	u32 tmp, clk, pause;
@@ -572,6 +573,20 @@ int wl1271_boot(struct wl1271 *wl)
 	if (ret < 0)
 		goto out;
 
+out:
+	return ret;
+}
+EXPORT_SYMBOL_GPL(wl1271_load_firmware);
+
+int wl1271_boot(struct wl1271 *wl)
+{
+	int ret;
+
+	/* upload NVS and firmware */
+	ret = wl1271_load_firmware(wl);
+	if (ret)
+		return ret;
+
 	/* 10.5 start firmware */
 	ret = wl1271_boot_run_firmware(wl);
 	if (ret < 0)
diff --git a/trunk/drivers/net/wireless/wl12xx/boot.h b/trunk/drivers/net/wireless/wl12xx/boot.h
index c7d771959f3a..d67dcffa31eb 100644
--- a/trunk/drivers/net/wireless/wl12xx/boot.h
+++ b/trunk/drivers/net/wireless/wl12xx/boot.h
@@ -27,6 +27,7 @@
 #include "wl12xx.h"
 
 int wl1271_boot(struct wl1271 *wl);
+int wl1271_load_firmware(struct wl1271 *wl);
 
 #define WL1271_NO_SUBBANDS 8
 #define WL1271_NO_POWER_LEVELS 4
diff --git a/trunk/drivers/net/wireless/wl12xx/io.c b/trunk/drivers/net/wireless/wl12xx/io.c
index 35c2f1aca6ba..d557f73e7c19 100644
--- a/trunk/drivers/net/wireless/wl12xx/io.c
+++ b/trunk/drivers/net/wireless/wl12xx/io.c
@@ -113,6 +113,7 @@ int wl1271_set_partition(struct wl1271 *wl,
 
 	return 0;
 }
+EXPORT_SYMBOL_GPL(wl1271_set_partition);
 
 void wl1271_io_reset(struct wl1271 *wl)
 {