diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-05-01 14:14:05 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-05-01 14:14:05 -0400 |
| commit | 076e7779c07c56c7fa593a28c71ea7432d0c7c95 (patch) | |
| tree | 70a4227b5d898c1abf37ed5779b0cd6f29b471bc /drivers/net/wireless/b43/main.c | |
| parent | 116a0fc31c6c9b8fc821be5a96e5bf0b43260131 (diff) | |
| parent | 66f2c99af3d6f2d0aa1120884cf1c60613ef61c0 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/b43/main.c')
| -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; } |