diff options
author | David S. Miller <davem@davemloft.net> | 2009-12-29 19:44:25 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-29 19:44:25 -0800 |
commit | 7f9d3577e2603ca279c3176b696eba392f21cbe2 (patch) | |
tree | e2135eddba600910cdebb54c8b01de53473ecefb /net/mac80211/util.c | |
parent | 96c5340147584481ef0c0afbb5423f7563c1d24a (diff) | |
parent | 55afc80b2ab100618c17af77915f75307b6bd5d1 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/mac80211/util.c')
-rw-r--r-- | net/mac80211/util.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 78a6e924c7e1..dc76267e436e 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1039,7 +1039,19 @@ int ieee80211_reconfig(struct ieee80211_local *local) /* restart hardware */ if (local->open_count) { + /* + * Upon resume hardware can sometimes be goofy due to + * various platform / driver / bus issues, so restarting + * the device may at times not work immediately. Propagate + * the error. + */ res = drv_start(local); + if (res) { + WARN(local->suspended, "Harware became unavailable " + "upon resume. This is could be a software issue" + "prior to suspend or a harware issue\n"); + return res; + } ieee80211_led_radio(local, true); } |