提交 6dd3587f 编写于 作者: O Oliver Neukum 提交者: Greg Kroah-Hartman

cdc-acm: cleanup error handling

A small update to unify error handling during probe().
Signed-off-by: NOliver Neukum <ONeukum@suse.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 eccf2a4e
...@@ -1328,11 +1328,8 @@ static int acm_probe(struct usb_interface *intf, ...@@ -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, ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册