diff options
| author | Grazvydas Ignotas <notasas@gmail.com> | 2010-04-13 01:21:40 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-04-14 14:59:53 -0400 |
| commit | afa5ec27f4d69952d4ae11f182258bf53d85fcf5 (patch) | |
| tree | 4cb1244b8c73caea64d03f2b29f8782b9be34444 | |
| parent | f8e1d0803d2db9ef0116941a4ce46069a2009ea6 (diff) | |
| download | linux-3.10-afa5ec27f4d69952d4ae11f182258bf53d85fcf5.tar.gz linux-3.10-afa5ec27f4d69952d4ae11f182258bf53d85fcf5.tar.bz2 linux-3.10-afa5ec27f4d69952d4ae11f182258bf53d85fcf5.zip | |
wl1251: don't require NVS data when EEPROM is used
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>
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1251_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 0155653b710..7b8b21212bf 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/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; |