diff options
| author | Johan Hovold <[email protected]> | 2020-09-21 13:59:51 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <[email protected]> | 2020-09-25 15:01:12 +0000 |
| commit | bf1c6744983339782b16078cc68b230cde7d29b9 (patch) | |
| tree | 42686a90db0941dc60662215c2616c132cb776c3 /drivers/usb/class/cdc-acm.h | |
| parent | USB: cdc-acm: use common data-class define (diff) | |
| download | kernel-bf1c6744983339782b16078cc68b230cde7d29b9.tar.gz kernel-bf1c6744983339782b16078cc68b230cde7d29b9.zip | |
USB: cdc-acm: clean up no-union-descriptor handling
For interfaces that lack a union descriptor, probe for a
"combined-interface" before falling back to the call-management
descriptor instead of the other way round.
This allows for the removal of the NO_DATA_INTERFACE quirk and makes the
probe algorithm somewhat easier to follow.
Acked-by: Oliver Neukum <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/usb/class/cdc-acm.h')
| -rw-r--r-- | drivers/usb/class/cdc-acm.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/usb/class/cdc-acm.h b/drivers/usb/class/cdc-acm.h index 96331c81550e..9dce179d031b 100644 --- a/drivers/usb/class/cdc-acm.h +++ b/drivers/usb/class/cdc-acm.h @@ -135,9 +135,8 @@ struct acm { #define NO_UNION_NORMAL BIT(0) #define SINGLE_RX_URB BIT(1) #define NO_CAP_LINE BIT(2) -#define NO_DATA_INTERFACE BIT(4) -#define IGNORE_DEVICE BIT(5) -#define QUIRK_CONTROL_LINE_STATE BIT(6) -#define CLEAR_HALT_CONDITIONS BIT(7) -#define SEND_ZERO_PACKET BIT(8) -#define DISABLE_ECHO BIT(9) +#define IGNORE_DEVICE BIT(3) +#define QUIRK_CONTROL_LINE_STATE BIT(4) +#define CLEAR_HALT_CONDITIONS BIT(5) +#define SEND_ZERO_PACKET BIT(6) +#define DISABLE_ECHO BIT(7) |