wlcore: don't hide real error code when booting fails

There's no need to hide the actual error that was reported when
booting fails.  For instance, on I/O error, we were returing
-EINVALID, which doesn't make sense at all.

Signed-off-by: Luciano Coelho <coelho@ti.com>
This commit is contained in:
Luciano Coelho 2013-01-30 10:53:14 +02:00
parent 6cc9efed70
commit 5dc283fe9a
1 changed files with 4 additions and 7 deletions

View File

@ -2162,7 +2162,7 @@ static int wl12xx_init_vif_data(struct wl1271 *wl, struct ieee80211_vif *vif)
return 0;
}
static bool wl12xx_init_fw(struct wl1271 *wl)
static int wl12xx_init_fw(struct wl1271 *wl)
{
int retries = WL1271_BOOT_RETRIES;
bool booted = false;
@ -2228,7 +2228,7 @@ power_off:
wl->state = WLCORE_STATE_ON;
out:
return booted;
return ret;
}
static bool wl12xx_dev_role_started(struct wl12xx_vif *wlvif)
@ -2371,7 +2371,6 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
struct vif_counter_data vif_count;
int ret = 0;
u8 role_type;
bool booted = false;
vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |
IEEE80211_VIF_SUPPORTS_CQM_RSSI;
@ -2432,11 +2431,9 @@ static int wl1271_op_add_interface(struct ieee80211_hw *hw,
*/
memcpy(wl->addresses[0].addr, vif->addr, ETH_ALEN);
booted = wl12xx_init_fw(wl);
if (!booted) {
ret = -EINVAL;
ret = wl12xx_init_fw(wl);
if (ret < 0)
goto out;
}
}
ret = wl12xx_cmd_role_enable(wl, vif->addr,