Commit afa5ec27 authored by Grazvydas Ignotas's avatar Grazvydas Ignotas Committed by John W. Linville

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: default avatarGrazvydas Ignotas <notasas@gmail.com>
Acked-by: default avatarKalle Valo <kvalo@adurom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f8e1d080
...@@ -201,8 +201,8 @@ static int wl1251_chip_wakeup(struct wl1251 *wl) ...@@ -201,8 +201,8 @@ static int wl1251_chip_wakeup(struct wl1251 *wl)
goto out; goto out;
} }
/* No NVS from netlink, try to get it from the filesystem */ if (wl->nvs == NULL && !wl->use_eeprom) {
if (wl->nvs == NULL) { /* No NVS from netlink, try to get it from the filesystem */
ret = wl1251_fetch_nvs(wl); ret = wl1251_fetch_nvs(wl);
if (ret < 0) if (ret < 0)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment