[IRDA]: irda-usb, unregister netdev when patch upload fails

In the STIR421x case, when the firmware upload fails, we need to
unregister_netdev. Otherwise we hit a BUG on free_netdev(), if sysfs
is enabled.

Signed-off-by: Samuel Ortiz <samuel.ortiz@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/irda/irda-usb.c b/drivers/net/irda/irda-usb.c
index 606243d117937b974f6e7aab9cf84c828970d67c..96bdb73c2283bb3cbcd8bcdc964062f660b5f15d 100644 (file)
--- a/drivers/net/irda/irda-usb.c
+++ b/drivers/net/irda/irda-usb.c
@@ -1815,14 +1815,14 @@ static int irda_usb_probe(struct usb_interface *intf,
                self->needspatch = (ret < 0);
                if (ret < 0) {
                        printk("patch_device failed\n");
-                       goto err_out_4;
+                       goto err_out_5;
                }
 
                /* replace IrDA class descriptor with what patched device is now reporting */
                irda_desc = irda_usb_find_class_desc (self->usbintf);
                if (irda_desc == NULL) {
                        ret = -ENODEV;
-                       goto err_out_4;
+                       goto err_out_5;
                }
                if (self->irda_desc)
                        kfree (self->irda_desc);
@@ -1832,6 +1832,8 @@ static int irda_usb_probe(struct usb_interface *intf,
 
        return 0;
 
+err_out_5:
+       unregister_netdev(self->netdev);
 err_out_4:
        kfree(self->speed_buff);
 err_out_3: