---

yaml --- r: 194275 b: refs/heads/master c: afa5ec2 h: refs/heads/master i: 194273: 1feee7c 194271: 4fe50bb v: v3
git-mirror · Apr 14, 2010 · 3fc345c · 3fc345c
1 parent fe84eb9
commit 3fc345c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;