diff options
author | Christian Lamparter | 2012-03-17 14:10:02 +0100 |
---|---|---|
committer | John W. Linville | 2012-04-09 22:07:35 +0200 |
commit | a9b9361dd5ef6c39703f2f0c8c18aa2e1f133fc5 (patch) | |
tree | edfb2d5ef162602a508257c49e2e6289005c9343 /drivers/net/wireless/p54/main.c | |
parent | mac80211: end service period only after sending last buffered frame (diff) | |
download | kernel-qcow2-linux-a9b9361dd5ef6c39703f2f0c8c18aa2e1f133fc5.tar.gz kernel-qcow2-linux-a9b9361dd5ef6c39703f2f0c8c18aa2e1f133fc5.tar.xz kernel-qcow2-linux-a9b9361dd5ef6c39703f2f0c8c18aa2e1f133fc5.zip |
p54: only unregister ieee80211_hw when it has been registered
p54_unregister_common may now be called by the backend
driver's remove routine, even if the ieee80211_hw device
struct was never successfully registered.
Signed-off-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/main.c')
-rw-r--r-- | drivers/net/wireless/p54/main.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index ee8af1f047c8..7cffea795ad2 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c @@ -796,11 +796,14 @@ int p54_register_common(struct ieee80211_hw *dev, struct device *pdev) dev_err(pdev, "Cannot register device (%d).\n", err); return err; } + priv->registered = true; #ifdef CONFIG_P54_LEDS err = p54_init_leds(priv); - if (err) + if (err) { + p54_unregister_common(dev); return err; + } #endif /* CONFIG_P54_LEDS */ dev_info(pdev, "is registered as '%s'\n", wiphy_name(dev->wiphy)); @@ -840,7 +843,11 @@ void p54_unregister_common(struct ieee80211_hw *dev) p54_unregister_leds(priv); #endif /* CONFIG_P54_LEDS */ - ieee80211_unregister_hw(dev); + if (priv->registered) { + priv->registered = false; + ieee80211_unregister_hw(dev); + } + mutex_destroy(&priv->conf_mutex); mutex_destroy(&priv->eeprom_mutex); } |