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@xxxxxxxxx>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@xxxxxxxxx>
---
drivers/net/wireless/wl12xx/wl1271_init.c | 7 ++-----
drivers/net/wireless/wl12xx/wl1271_main.c | 7 ++-----
2 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c
index 44896ac..11249b4 100644
--- a/drivers/net/wireless/wl12xx/wl1271_init.c
+++ b/drivers/net/wireless/wl12xx/wl1271_init.c
@@ -197,15 +197,12 @@ int wl1271_hw_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;
/* Template settings */
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c
index b75557e..64d0526 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);
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
