diff options
| author | Seth Forshee <seth.forshee@canonical.com> | 2012-04-25 17:28:00 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-27 15:25:25 -0400 |
| commit | dbdedbdf4fbff3d4962a0786f37aa86dfdc48a7e (patch) | |
| tree | b2816c0c7140b19d89500608170e69b4d13c82a6 /drivers/net | |
| parent | 1ed2ec37b44e86eaa8e0a03b908a39c80f65ee45 (diff) | |
| download | linux-3.10-dbdedbdf4fbff3d4962a0786f37aa86dfdc48a7e.tar.gz linux-3.10-dbdedbdf4fbff3d4962a0786f37aa86dfdc48a7e.tar.bz2 linux-3.10-dbdedbdf4fbff3d4962a0786f37aa86dfdc48a7e.zip | |
b43: only reload config after successful initialization
Commit 2a19032 (b43: reload phy and bss settings after core restarts)
introduced an unconditional call to b43_op_config() at the end of
b43_op_start(). When firmware fails to load this can wedge the system.
There's no need to reload the configuration after a failed
initialization anyway, so only make the call if initialization was
successful.
BugLink: http://bugs.launchpad.net/bugs/950295
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/b43/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index c79e6638c88..e4d6dc2e37d 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c @@ -4827,8 +4827,14 @@ static int b43_op_start(struct ieee80211_hw *hw) out_mutex_unlock: mutex_unlock(&wl->mutex); - /* reload configuration */ - b43_op_config(hw, ~0); + /* + * Configuration may have been overwritten during initialization. + * Reload the configuration, but only if initialization was + * successful. Reloading the configuration after a failed init + * may hang the system. + */ + if (!err) + b43_op_config(hw, ~0); return err; } |