diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-02-25 11:12:17 (GMT) |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-02-25 11:12:17 (GMT) |
commit | d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902 (patch) | |
tree | 4fe17a547c8c4e403c18cdc6a6c5e30c6f437bc9 /drivers/staging/media | |
parent | bf68665d7a5647591258c120382fd64465db7d63 (diff) | |
parent | 37c367ecdb9a01c9acc980e6e17913570a1788a7 (diff) | |
download | linux-d01a838c86b60fdce4fbc9e51d5d14d6cfe0a902.tar.xz |
Merge branch 'for-linus' into HEAD
Diffstat (limited to 'drivers/staging/media')
-rw-r--r-- | drivers/staging/media/go7007/go7007-loader.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/media/go7007/go7007-loader.c b/drivers/staging/media/go7007/go7007-loader.c index 10bb41c..eecb1f2 100644 --- a/drivers/staging/media/go7007/go7007-loader.c +++ b/drivers/staging/media/go7007/go7007-loader.c @@ -59,7 +59,7 @@ static int go7007_loader_probe(struct usb_interface *interface, if (usbdev->descriptor.bNumConfigurations != 1) { dev_err(&interface->dev, "can't handle multiple config\n"); - return -ENODEV; + goto failed2; } vendor = le16_to_cpu(usbdev->descriptor.idVendor); @@ -108,6 +108,7 @@ static int go7007_loader_probe(struct usb_interface *interface, return 0; failed2: + usb_put_dev(usbdev); dev_err(&interface->dev, "probe failed\n"); return -ENODEV; } @@ -115,6 +116,7 @@ failed2: static void go7007_loader_disconnect(struct usb_interface *interface) { dev_info(&interface->dev, "disconnect\n"); + usb_put_dev(interface_to_usbdev(interface)); usb_set_intfdata(interface, NULL); } |