Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...

[karo-tx-linux.git] / net / mac802154 / main.c

diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 68b9667323ece799f646f9f443156d55c8e611ff..08cb32dc8fd33e892e53f7f87f601b10ede8c38d 100644 (file)
--- 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: