openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

cdc-acm: cleanup error handling 

A small update to unify error handling during probe().

Signed-off-by: Oliver Neukum <ONeukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Oliver Neukum 2016-07-14 15:41:32 +02:00 committed by Greg Kroah-Hartman
parent eccf2a4e6b
commit 6dd3587f51
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/usb/class/cdc-acm.c
View File

@ -1328,11 +1328,8 @@ static int acm_probe(struct usb_interface *intf,
goto alloc_fail; goto alloc_fail;
minor = acm_alloc_minor(acm); minor = acm_alloc_minor(acm);
if (minor < 0) { if (minor < 0)
dev_err(&intf->dev, "no more free acm devices\n"); goto alloc_fail1;
kfree(acm);
return -ENODEV;
}
ctrlsize = usb_endpoint_maxp(epctrl); ctrlsize = usb_endpoint_maxp(epctrl);
readsize = usb_endpoint_maxp(epread) * readsize = usb_endpoint_maxp(epread) *
@ -1523,6 +1520,7 @@ static int acm_probe(struct usb_interface *intf,
usb_free_coherent(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma); usb_free_coherent(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
alloc_fail2: alloc_fail2:
acm_release_minor(acm); acm_release_minor(acm);
alloc_fail1:
kfree(acm); kfree(acm);
alloc_fail: alloc_fail:
return rv; return rv;