diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2021-04-08 10:22:14 +0300 |
| commit | d527353e4bceae6d59606ad21ad00916401d22ad (patch) | |
| tree | 8ad569177aa89f15dcc485ee31d671cc98344ba8 /drivers/usb/class/cdc-acm.c | |
| parent | 70bfb30743d5da73058b0a2271e9c127a84fb494 (diff) | |
| parent | 9c0fed84d5750e1eea6c664e073ffa2534a17743 (diff) | |
Merge drm/drm-next into drm-intel-next
Sync up with topic/i915-gem-next and drm-intel-gt-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 37f824b59daa..39ddb5585ded 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1935,6 +1935,11 @@ static const struct usb_device_id acm_ids[] = { .driver_info = SEND_ZERO_PACKET, }, + /* Exclude Goodix Fingerprint Reader */ + { USB_DEVICE(0x27c6, 0x5395), + .driver_info = IGNORE_DEVICE, + }, + /* control interfaces without any protocol set */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM, USB_CDC_PROTO_NONE) }, |