Skip to content

Commit

Permalink
wlcore: don't hide real error code when booting fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luciano Coelho committed Feb 8, 2013
1 parent 6cc9efe commit 5dc283f
Showing 1 changed file with 4 additions and 7 deletions.
11 changes: 4 additions & 7 deletions drivers/net/wireless/ti/wlcore/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -2228,7 +2228,7 @@ static bool wl12xx_init_fw(struct wl1271 *wl)

wl->state = WLCORE_STATE_ON;
out:
return booted;
return ret;
}

static bool wl12xx_dev_role_started(struct wl12xx_vif *wlvif)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down

0 comments on commit 5dc283f

Please sign in to comment.