diff options
| -rw-r--r-- | drivers/staging/vt6656/main_usb.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 3a58214c2744..e992d5d9e15b 100644 --- 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) |