1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 183b41753c98..62f4fb9b362f 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1301,10 +1301,6 @@ made_compressed_probe:
         tty_port_init(&acm->port);
         acm->port.ops = &acm_port_ops;
 
-        minor = acm_alloc_minor(acm);
-        if (minor < 0)
-                goto alloc_fail1;
-
         ctrlsize = usb_endpoint_maxp(epctrl);
         readsize = usb_endpoint_maxp(epread) *
                                 (quirks == SINGLE_RX_URB ? 1 : 2);
@@ -1312,6 +1308,13 @@ made_compressed_probe:
         acm->writesize = usb_endpoint_maxp(epwrite) * 20;
         acm->control = control_interface;
         acm->data = data_interface;
+
+        usb_get_intf(acm->control); /* undone in destruct() */
+
+        minor = acm_alloc_minor(acm);
+        if (minor < 0)
+                goto alloc_fail1;
+
         acm->minor = minor;
         acm->dev = usb_dev;
         if (h.usb_cdc_acm_descriptor)
@@ -1458,7 +1461,6 @@ skip_countries:
         usb_driver_claim_interface(&acm_driver, data_interface, acm);
         usb_set_intfdata(data_interface, acm);
 
-        usb_get_intf(control_interface);
         tty_dev = tty_port_register_device(&acm->port, acm_tty_driver, minor,
                         &control_interface->dev);
         if (IS_ERR(tty_dev)) {