Skip to content

Commit

Permalink
wl1271: remove workaround to ignore -EIO from radio and general params
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Luciano Coelho authored and John W. Linville committed Nov 28, 2009
1 parent 98b5dd5 commit 4a90406
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
7 changes: 2 additions & 5 deletions drivers/net/wireless/wl12xx/wl1271_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
7 changes: 2 additions & 5 deletions drivers/net/wireless/wl12xx/wl1271_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 4a90406

Please sign in to comment.