openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Grazvydas Ignotas 2010-04-13 01:21:40 +03:00 committed by John W. Linville
parent f8e1d0803d
commit afa5ec27f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/wl12xx/wl1251_main.c
View 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;