From 3fc345cc3ddeec32931e52502bc5feefa0d29041 Mon Sep 17 00:00:00 2001
From: Grazvydas Ignotas <notasas@gmail.com>
Date: Tue, 13 Apr 2010 01:21:40 +0300
Subject: [PATCH] --- yaml --- r: 194275 b: refs/heads/master c:
 afa5ec27f4d69952d4ae11f182258bf53d85fcf5 h: refs/heads/master i:   194273:
 1feee7ce48b7beb88b36f19a303e4113a0339025   194271:
 4fe50bb0d04904bbb5265a2077751d69942c4caa v: v3

---
 [refs]                                          | 2 +-
 trunk/drivers/net/wireless/wl12xx/wl1251_main.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 8b6ab39c52cf..4ea6efe89ecd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f8e1d0803d2db9ef0116941a4ce46069a2009ea6
+refs/heads/master: afa5ec27f4d69952d4ae11f182258bf53d85fcf5
diff --git a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
index 0155653b7105..7b8b21212bf7 100644
--- a/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/trunk/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -201,8 +201,8 @@ static int wl1251_chip_wakeup(struct wl1251 *wl)
 			goto out;
 	}
 
-	/* No NVS from netlink, try to get it from the filesystem */
-	if (wl->nvs == NULL) {
+	if (wl->nvs == NULL && !wl->use_eeprom) {
+		/* No NVS from netlink, try to get it from the filesystem */
 		ret = wl1251_fetch_nvs(wl);
 		if (ret < 0)
 			goto out;