aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1271_init.c
diff options
context:
space:
mode:
authorLuciano Coelho <luciano.coelho@nokia.com>2009-11-23 16:22:18 -0500
committerJohn W. Linville <linville@tuxdriver.com>2009-11-28 15:04:31 -0500
commit4a90406b876cade9bb8d9c95b048d60fb979ba6b (patch)
tree557425e0028ef1953012498ae4ced0b1e87b6215 /drivers/net/wireless/wl12xx/wl1271_init.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_init.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1271_init.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c
index 44896accffd4..11249b436cf1 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)
197{ 197{
198 int ret; 198 int ret;
199 199
200 /* FIXME: the following parameter setting functions return error
201 * codes - the reason is so far unknown. The -EIO is therefore
202 * ignored for the time being. */
203 ret = wl1271_cmd_general_parms(wl); 200 ret = wl1271_cmd_general_parms(wl);
204 if (ret < 0 && ret != -EIO) 201 if (ret < 0)
205 return ret; 202 return ret;
206 203
207 ret = wl1271_cmd_radio_parms(wl); 204 ret = wl1271_cmd_radio_parms(wl);
208 if (ret < 0 && ret != -EIO) 205 if (ret < 0)
209 return ret; 206 return ret;
210 207
211 /* Template settings */ 208 /* Template settings */