Commit afa5ec27 authored Apr 13, 2010 by Grazvydas Ignotas Committed by John W. Linville Apr 14, 2010

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>

parent f8e1d080

drivers/net/wireless/wl12xx/wl1251_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -201,8 +201,8 @@ static int wl1251_chip_wakeup(struct wl1251 *wl)
		goto out;
		}

		if (wl->nvs == NULL && !wl->use_eeprom) {
		/* No NVS from netlink, try to get it from the filesystem */
		if (wl->nvs == NULL) {
		ret = wl1251_fetch_nvs(wl);
		if (ret < 0)
		goto out;