Skip to content

Commit

Permalink
wl1251: don't require NVS data when EEPROM is used
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Grazvydas Ignotas authored and John W. Linville committed Apr 14, 2010
1 parent f8e1d08 commit afa5ec2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/wireless/wl12xx/wl1251_main.c
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit afa5ec2

Please sign in to comment.