iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: cdc-acm: use common data-class define

Browse Source 
Use the data-class define provided by USB core and drop the
driver-specific one.

Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20200921135951.24045-4-johan@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold
2020-09-21 15:59:50 +02:00
committed by Greg Kroah-Hartman
parent 960c7339de
commit 319bb4a7fe
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1288,10 +1288,8 @@ look_for_collapsed_interface:
skip_normal_probe: skip_normal_probe:
/*workaround for switched interfaces */ /*workaround for switched interfaces */
if (data_interface->cur_altsetting->desc.bInterfaceClass if (data_interface->cur_altsetting->desc.bInterfaceClass != USB_CLASS_CDC_DATA) {
!= CDC_DATA_INTERFACE_TYPE) { if (control_interface->cur_altsetting->desc.bInterfaceClass == USB_CLASS_CDC_DATA) {
if (control_interface->cur_altsetting->desc.bInterfaceClass
== CDC_DATA_INTERFACE_TYPE) {
dev_dbg(&intf->dev, dev_dbg(&intf->dev,
"Your device has switched interfaces.\n"); "Your device has switched interfaces.\n");
swap(control_interface, data_interface); swap(control_interface, data_interface);

2
drivers/usb/class/cdc-acm.h
View File

@ -131,8 +131,6 @@ struct acm {
unsigned long quirks; unsigned long quirks;
}; };
#define CDC_DATA_INTERFACE_TYPE 0x0a
/* constants describing various quirks and errors */ /* constants describing various quirks and errors */
#define NO_UNION_NORMAL BIT(0) #define NO_UNION_NORMAL BIT(0)
#define SINGLE_RX_URB BIT(1) #define SINGLE_RX_URB BIT(1)