aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/wl1271_main.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-11-23 23:22:18 +0200
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:31 -0500
commit4a90406b876cade9bb8d9c95b048d60fb979ba6b (patch)
tree557425e0028ef1953012498ae4ced0b1e87b6215 /drivers/net/wireless/wl12xx/wl1271_main.c
parent98b5dd5ded8cb59b598b2c0c396100054779eda7 (diff)
wl1271: remove workaround to ignore -EIO from radio and general params
We were ignoring the -EIO return value from wl1271_cmd_radio_params() and wl1271_cmd_general_params(), because they were always returning an error and we didn't know why. Now this has been fixed, so the workaround can be removed. Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com> Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_main.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_main.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b75557e0e68..64d05265f7e 100644
--- a/drivers/net/wireless/wl12xx/wl1271_main.c
+++ b/drivers/net/wireless/wl12xx/wl1271_main.c
@@ -354,15 +354,12 @@ static int wl1271_plt_init(struct wl1271 *wl)
{
int ret;
- /* FIXME: the following parameter setting functions return error
- * codes - the reason is so far unknown. The -EIO is therefore
- * ignored for the time being. */
ret = wl1271_cmd_general_parms(wl);
- if (ret < 0 && ret != -EIO)
+ if (ret < 0)
return ret;
ret = wl1271_cmd_radio_parms(wl);
- if (ret < 0 && ret != -EIO)
+ if (ret < 0)
return ret;
ret = wl1271_acx_init_mem_config(wl);