diff options
| author | David S. Miller <davem@davemloft.net> | 2015-03-06 15:46:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-03-06 15:46:08 -0500 |
| commit | 28c0f02ffe8a614bc7e1aa57319a62e7ce700d04 (patch) | |
| tree | 078ee8553662a5f6d82d31859c160ceab866c2d6 /drivers/net/wireless/libertas | |
| parent | 89650ad0047f039b3c3bc0f6a5823bb9c9738152 (diff) | |
| parent | 1ca2760fb2c13959fcba794695cd5b306cbfa6a4 (diff) | |
Merge tag 'wireless-drivers-next-for-davem-2015-03-06' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next
Major changes:
brcmfmac:
* sdio improvements
* add a debugfs file so users can provide us all the revinfo we could
ask for
iwlwifi:
* add triggers for firmware dump collection
* remove support for -9.ucode
* new statitics API
* rate control improvements
ath9k:
* add per-vif TX power capability
* BT coexistance fixes
ath10k:
* qca6174: enable STA transmit beamforming (TxBF) support
* disable multi-vif power save by default
bcma:
* enable support for PCIe Gen 2 host devices
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/debugfs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index cc6a0a586f0b..26cbf1dcc662 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c @@ -742,8 +742,7 @@ void lbs_debugfs_init(void) void lbs_debugfs_remove(void) { - if (lbs_dir) - debugfs_remove(lbs_dir); + debugfs_remove(lbs_dir); } void lbs_debugfs_init_one(struct lbs_private *priv, struct net_device *dev) |