summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorVincent Cuissard <cuissard@marvell.com>2015-06-11 11:25:45 +0200
committerSamuel Ortiz <sameo@linux.intel.com>2015-06-11 23:24:47 +0200
commit8a81a96bd116ef5c505f37e035ce141f6b35a6a7 (patch)
treec9d266041aea496df379e249b5a481b431536b0a /drivers
parentNFC: nfcmrvl: update nci recv frame API (diff)
downloadlinux-8a81a96bd116ef5c505f37e035ce141f6b35a6a7.tar.xz
linux-8a81a96bd116ef5c505f37e035ce141f6b35a6a7.zip
NFC: nfcmrvl: update USB device id
Device ID was not restrictive enough. This patch select the USB device with the full device and interface characteristics. Signed-off-by: Vincent Cuissard <cuissard@marvell.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/nfc/nfcmrvl/usb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/nfc/nfcmrvl/usb.c b/drivers/nfc/nfcmrvl/usb.c
index f81861af5b25..c4046b681bfa 100644
--- a/drivers/nfc/nfcmrvl/usb.c
+++ b/drivers/nfc/nfcmrvl/usb.c
@@ -26,7 +26,8 @@
#define VERSION "1.0"
static struct usb_device_id nfcmrvl_table[] = {
- { USB_DEVICE_INTERFACE_CLASS(0x1286, 0x2046, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(0x1286, 0x2046,
+ USB_CLASS_VENDOR_SPEC, 4, 1) },
{ } /* Terminating entry */
};