3 files changed, 7 insertions, 15 deletions

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 077d58ac3dcb..546a17e8ad5b 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -1157,8 +1157,6 @@ static int acm_probe(struct usb_interface *intf,
                 case USB_CDC_CALL_MANAGEMENT_TYPE:
                         call_management_function = buffer[3];
                         call_interface_num = buffer[4];
-                        if ((quirks & NOT_A_MODEM) == 0 && (call_management_function & 3) != 3)
-                                dev_err(&intf->dev, "This device cannot do calls on its own. It is not a modem.\n");
                         break;
                 default:
                         /* there are LOTS more CDC descriptors that
@@ -1197,10 +1195,11 @@ next_desc:
         } else {
                 control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0);
                 data_interface = usb_ifnum_to_if(usb_dev, (data_interface_num = union_header->bSlaveInterface0));
-                if (!control_interface || !data_interface) {
-                        dev_dbg(&intf->dev, "no interfaces\n");
-                        return -ENODEV;
-                }
+        }
+
+        if (!control_interface || !data_interface) {
+                dev_dbg(&intf->dev, "no interfaces\n");
+                return -ENODEV;
         }
 
         if (data_interface_num != call_interface_num)
@@ -1475,6 +1474,7 @@ alloc_fail8:
                                 &dev_attr_wCountryCodes);
                 device_remove_file(&acm->control->dev,
                                 &dev_attr_iCountryCodeRelDate);
+                kfree(acm->country_codes);
         }
         device_remove_file(&acm->control->dev, &dev_attr_bmCapabilities);
 alloc_fail7:
@@ -1813,11 +1813,6 @@ static const struct usb_device_id acm_ids[] = {
 
         /* NOTE: non-Nokia COMM/ACM/0xff is likely MSFT RNDIS... NOT a modem! */
 
-        /* Support Lego NXT using pbLua firmware */
-        { USB_DEVICE(0x0694, 0xff00),
-        .driver_info = NOT_A_MODEM,
-        },
-
         /* Support for Droids MuIn LCD */
         { USB_DEVICE(0x04d8, 0x000b),
         .driver_info = NO_DATA_INTERFACE,
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h
index d3251ebd09e2..ffeb3c83941f 100644
--- a/drivers/usb/class/cdc-acm.h
+++ b/drivers/usb/class/cdc-acm.h
@@ -130,7 +130,6 @@ struct acm {
 #define NO_UNION_NORMAL                 BIT(0)
 #define SINGLE_RX_URB                   BIT(1)
 #define NO_CAP_LINE                     BIT(2)
-#define NOT_A_MODEM                     BIT(3)
 #define NO_DATA_INTERFACE               BIT(4)
 #define IGNORE_DEVICE                   BIT(5)
 #define QUIRK_CONTROL_LINE_STATE        BIT(6)
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index ec978408a2ee..960bc089111b 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -1104,10 +1104,8 @@ static int usbtmc_probe(struct usb_interface *intf,
         dev_dbg(&intf->dev, "%s called\n", __func__);
 
         data = devm_kzalloc(&intf->dev, sizeof(*data), GFP_KERNEL);
-        if (!data) {
-                dev_err(&intf->dev, "Unable to allocate kernel memory\n");
+        if (!data)
                 return -ENOMEM;
-        }
 
         data->intf = intf;
         data->id = id;