wl1251: don't require NVS data when EEPROM is used
authorGrazvydas Ignotas <notasas@gmail.com>
Mon, 12 Apr 2010 22:21:40 +0000 (01:21 +0300)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 14 Apr 2010 18:59:53 +0000 (14:59 -0400)
If EEPROM is used, NVS data is now loaded but ignored.
Stop loading it to avoid need of dummy NVS file for modules with EEPROM.

Signed-off-by: Grazvydas Ignotas <notasas@gmail.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/wl12xx/wl1251_main.c

index 0155653b7105b6fc57afa52cb5ce7d7e4a321242..7b8b21212bf79a6648ee07a9756e5b8b2549cf9f 100644 (file)
@@ -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;