|
@@ -3221,6 +3221,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
|
|
|
struct b43legacy_wldev *dev = wl->current_dev;
|
|
|
int did_init = 0;
|
|
|
int err = 0;
|
|
|
+ bool do_rfkill_exit = 0;
|
|
|
|
|
|
/* First register RFkill.
|
|
|
* LEDs that are registered later depend on it. */
|
|
@@ -3230,8 +3231,10 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
|
|
|
|
|
|
if (b43legacy_status(dev) < B43legacy_STAT_INITIALIZED) {
|
|
|
err = b43legacy_wireless_core_init(dev);
|
|
|
- if (err)
|
|
|
+ if (err) {
|
|
|
+ do_rfkill_exit = 1;
|
|
|
goto out_mutex_unlock;
|
|
|
+ }
|
|
|
did_init = 1;
|
|
|
}
|
|
|
|
|
@@ -3240,6 +3243,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
|
|
|
if (err) {
|
|
|
if (did_init)
|
|
|
b43legacy_wireless_core_exit(dev);
|
|
|
+ do_rfkill_exit = 1;
|
|
|
goto out_mutex_unlock;
|
|
|
}
|
|
|
}
|
|
@@ -3247,6 +3251,9 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
|
|
|
out_mutex_unlock:
|
|
|
mutex_unlock(&wl->mutex);
|
|
|
|
|
|
+ if (do_rfkill_exit)
|
|
|
+ b43legacy_rfkill_exit(dev);
|
|
|
+
|
|
|
return err;
|
|
|
}
|
|
|
|