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>

1 files changed, 3 insertions, 5 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 561baed7ba01..2e5dea866b6f 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1328,11 +1328,8 @@ made_compressed_probe:
                 goto alloc_fail;
 
         minor = acm_alloc_minor(acm);
-        if (minor < 0) {
-                dev_err(&intf->dev, "no more free acm devices\n");
-                kfree(acm);
-                return -ENODEV;
-        }
+        if (minor < 0)
+                goto alloc_fail1;
 
         ctrlsize = usb_endpoint_maxp(epctrl);
         readsize = usb_endpoint_maxp(epread) *
@@ -1523,6 +1520,7 @@ alloc_fail4:
         usb_free_coherent(usb_dev, ctrlsize, acm->ctrl_buffer, acm->ctrl_dma);
 alloc_fail2:
         acm_release_minor(acm);
+alloc_fail1:
         kfree(acm);
 alloc_fail:
         return rv;