diff options
| author | Arik Nemtsov <arik@wizery.com> | 2012-05-29 15:38:05 (GMT) |
|---|---|---|
| committer | Luciano Coelho <coelho@ti.com> | 2012-06-08 06:52:06 (GMT) |
| commit | 3e3947fffc2ebe8c52891b3fca195172875dc951 (patch) | |
| tree | 425a4d788ff757d7fd09694458125830aa288040 /drivers/net/wireless/ti/wlcore/boot.c | |
| parent | 17d97719dc2fe2b9c13831dc2c8572b54efe00b4 (diff) | |
| download | linux-3e3947fffc2ebe8c52891b3fca195172875dc951.tar.xz | |
wlcore/wl12xx/wl18xx: make NVS file optional for wl18xx
Don't spew errors when we can't find the NVS file in wlcore. Instead
fail the wl12xx boot HW op if the NVS isn't found.
Take this opportunity to remove some dead code from register_hw()
which looks for the NVS again needlessly.
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/ti/wlcore/boot.c')
| -rw-r--r-- | drivers/net/wireless/ti/wlcore/boot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wlcore/boot.c b/drivers/net/wireless/ti/wlcore/boot.c index ed718f7..0fda500 100644 --- a/drivers/net/wireless/ti/wlcore/boot.c +++ b/drivers/net/wireless/ti/wlcore/boot.c @@ -211,8 +211,10 @@ int wlcore_boot_upload_nvs(struct wl1271 *wl) u32 dest_addr, val; u8 *nvs_ptr, *nvs_aligned; - if (wl->nvs == NULL) + if (wl->nvs == NULL) { + wl1271_error("NVS file is needed during boot"); return -ENODEV; + } if (wl->quirks & WLCORE_QUIRK_LEGACY_NVS) { struct wl1271_nvs_file *nvs = |