From: Vincent Cuissard <cuissard@marvell.com>
Date: Thu, 11 Jun 2015 09:25:45 +0000 (+0200)
Subject: NFC: nfcmrvl: update USB device id
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8a81a96bd116ef5c505f37e035ce141f6b35a6a7;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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 */
 };