mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-09-22 12:24:38 +00:00
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:
parent
f8e1d0803d
commit
afa5ec27f4
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue