diff options
| author | David S. Miller <davem@davemloft.net> | 2015-05-09 15:51:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-05-09 15:51:00 -0400 |
| commit | 0a801445db4cb00bc900fd89b1e5eb7d7b581d7e (patch) | |
| tree | 4f51360cac0abfed65441bcf2165fc8ebe31a150 /net/mac802154/main.c | |
| parent | 31ccd0e66d41f73cfc21a8de976e713455205228 (diff) | |
| parent | 89eb6d0677a6daf134015bc7bd5ec1432911eed2 (diff) | |
| download | linux-0a801445db4cb00bc900fd89b1e5eb7d7b581d7e.tar.gz linux-0a801445db4cb00bc900fd89b1e5eb7d7b581d7e.tar.bz2 linux-0a801445db4cb00bc900fd89b1e5eb7d7b581d7e.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
Johan Hedberg says:
====================
Here are a couple of important Bluetooth & mac802154 fixes for 4.1:
- mac802154 fix for crypto algorithm allocation failure checking
- mac802154 wpan phy leak fix for error code path
- Fix for not calling Bluetooth shutdown() if interface is not up
Let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac802154/main.c')
| -rw-r--r-- | net/mac802154/main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac802154/main.c b/net/mac802154/main.c index 68b9667323ec..08cb32dc8fd3 100644 --- a/net/mac802154/main.c +++ b/net/mac802154/main.c @@ -167,13 +167,15 @@ int ieee802154_register_hw(struct ieee802154_hw *hw) if (IS_ERR(dev)) { rtnl_unlock(); rc = PTR_ERR(dev); - goto out_wq; + goto out_phy; } rtnl_unlock(); return 0; +out_phy: + wpan_phy_unregister(local->phy); out_wq: destroy_workqueue(local->workqueue); out: |