Merge branch 'linus' into irq/threaded

[linux-2.6-omap-h63xx.git] / drivers / staging / wlan-ng / prism2usb.c

diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index 0bb4e78330604f10b761489329daca145e35cf74..d8a12982135d75ea55dc72cb303af91fa32c4dbc 100644 (file)
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -165,13 +165,12 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
        goto done;
 
 failed:
-       if (wlandev)
-               kfree(wlandev);
-       if (hw)
-               kfree(hw);
+       kfree(wlandev);
+       kfree(hw);
        wlandev = NULL;
 
 done:
+       p80211_allow_ioctls(wlandev);
        usb_set_intfdata(interface, wlandev);
        return result;
 }