diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-09 11:17:24 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-09 11:17:24 -0800 |
| commit | f6d773cd4f3c18c40ab25a5cb92453756237840e (patch) | |
| tree | 5631a6ea4495ae2eb5058fb63b25dea3b197d61b /drivers/net/wireless/wl12xx/wl1271_init.c | |
| parent | d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4 (diff) | |
| parent | bcb628d579a61d0ab0cac4c6cc8a403de5254920 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_init.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_init.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c index 417b4152feb..7c2017f480e 100644 --- a/drivers/net/wireless/wl12xx/wl1271_init.c +++ b/drivers/net/wireless/wl12xx/wl1271_init.c @@ -303,12 +303,15 @@ 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_init_general_parms(wl); - if (ret < 0) + if (ret < 0 && ret != -EIO) return ret; ret = wl1271_init_radio_parms(wl); - if (ret < 0) + if (ret < 0 && ret != -EIO) return ret; /* Template settings */ |