These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / net / wireless / orinoco / orinoco_usb.c

diff --git a/kernel/drivers/net/wireless/orinoco/orinoco_usb.c b/kernel/drivers/net/wireless/orinoco/orinoco_usb.c
index 8fb1c92..6c0f4c9 100644 (file)
--- a/kernel/drivers/net/wireless/orinoco/orinoco_usb.c
+++ b/kernel/drivers/net/wireless/orinoco/orinoco_usb.c
@@ -1502,6 +1502,7 @@ static inline void ezusb_delete(struct ezusb_priv *upriv)
        if (upriv->dev) {
                struct orinoco_private *priv = ndev_priv(upriv->dev);
                orinoco_if_del(priv);
+               wiphy_unregister(priv_to_wiphy(upriv));
                free_orinocodev(priv);
        }
 }
@@ -1575,6 +1576,7 @@ static int ezusb_probe(struct usb_interface *interface,
                                ezusb_hard_reset, NULL);
        if (!priv) {
                err("Couldn't allocate orinocodev");
+               retval = -ENOMEM;
                goto exit;
        }
 
@@ -1695,6 +1697,7 @@ static int ezusb_probe(struct usb_interface *interface,
        if (orinoco_if_add(priv, 0, 0, &ezusb_netdev_ops) != 0) {
                upriv->dev = NULL;
                err("%s: orinoco_if_add() failed", __func__);
+               wiphy_unregister(priv_to_wiphy(priv));
                goto error;
        }
        upriv->dev = priv->ndev;