diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 22:59:02 -0500 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-12-14 22:59:02 -0500 |
| commit | 7b5d49941dedf1b6634c2b0a110dc2a6f12180c3 (patch) | |
| tree | 0be6ff4b2a5933898f7fc639746112ca0b7fefc6 /drivers/net/wireless/intersil | |
| parent | 1dcf2103d80a19dc9562e63eb2fb0084e362c3f1 (diff) | |
| parent | 8743ce3d7c9698285310920c443c086e337aef44 (diff) | |
| download | linux-rt-7b5d49941dedf1b6634c2b0a110dc2a6f12180c3.tar.gz | |
Merge tag 'v4.9.66' into v4.9-rt
This is the 4.9.66 stable release
Conflicts:
kernel/sched/rt.c
Diffstat (limited to 'drivers/net/wireless/intersil')
| -rw-r--r-- | drivers/net/wireless/intersil/p54/main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c index d5a3bf91a03e..ab6d39e12069 100644 --- a/drivers/net/wireless/intersil/p54/main.c +++ b/drivers/net/wireless/intersil/p54/main.c @@ -852,12 +852,11 @@ void p54_unregister_common(struct ieee80211_hw *dev) { struct p54_common *priv = dev->priv; -#ifdef CONFIG_P54_LEDS - p54_unregister_leds(priv); -#endif /* CONFIG_P54_LEDS */ - if (priv->registered) { priv->registered = false; +#ifdef CONFIG_P54_LEDS + p54_unregister_leds(priv); +#endif /* CONFIG_P54_LEDS */ ieee80211_unregister_hw(dev); } |