Staging: vt6656: problems in error handling

The first kfree(pDevice) is pointless because pDevice is NULL.  The
second kfree(pDevice) is a double free because pDevice is the driver's
private data and that is already freed by free_netdev(netdev).  Also the
free_netdev() error path doesn't call usb_put_dev().

Signed-off-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c
index 3a58214c2744eb94bd259a710d729afed75b0377..e992d5d9e15bc13e80031e99591f92c1e62357c0 100644 (file)
--- a/drivers/staging/vt6656/main_usb.c
+++ b/drivers/staging/vt6656/main_usb.c
@@ -770,10 +770,9 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        udev = usb_get_dev(udev);
        netdev = alloc_etherdev(sizeof(DEVICE_INFO));
-
        if (!netdev) {
                printk(KERN_ERR DEVICE_NAME ": allocate net device failed\n");
-               kfree(pDevice);
+               rc = -ENOMEM;
                goto err_nomem;
        }
 
@@ -799,9 +798,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
        rc = register_netdev(netdev);
        if (rc) {
                printk(KERN_ERR DEVICE_NAME " Failed to register netdev\n");
-               free_netdev(netdev);
-               kfree(pDevice);
-               return -ENODEV;
+               goto err_netdev;
        }
 
        usb_device_reset(pDevice);
@@ -819,10 +816,12 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
 
        return 0;
 
+err_netdev:
+       free_netdev(netdev);
 err_nomem:
        usb_put_dev(udev);
 
-       return -ENOMEM;
+       return rc;
 }
 
 static void device_free_tx_bufs(PSDevice pDevice)