Sorry all, that was indeed a typo. -----Original Message----- From: Roland Dreier [mailto:[EMAIL PROTECTED] Sent: Monday, September 04, 2006 9:31 AM To: [EMAIL PROTECTED] Cc: linux-kernel@vger.kernel.org; Gene Heskett; Roberson, Jeremy; linux-usb-users@lists.sourceforge.net Subject: [PATCH] [USB] hid-core.c: Fix apparent typo in GTCO blacklist entries Importance: High
Commit 6f8d9e26e7deecb1296c221aa979542bc5d63f20 added blacklist entries for GTCO products, but it included an apparent cut-and-paste typo (the device ID entry for GTCO_404 is duplicated with two different values, and used twice in the blacklist). This leads to the warning: drivers/usb/input/hid-core.c:1447:1: warning: "USB_DEVICE_ID_GTCO_404" redefined Fix this by correcting the second device ID name to GTCO_405, and using it in the blacklist. Signed-off-by: Roland Dreier <[EMAIL PROTECTED]> --- diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index acb24c6..a2c56b2 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c @@ -1444,7 +1444,7 @@ #define USB_DEVICE_ID_GTCO_401 0x0401 #define USB_DEVICE_ID_GTCO_402 0x0402 #define USB_DEVICE_ID_GTCO_403 0x0403 #define USB_DEVICE_ID_GTCO_404 0x0404 -#define USB_DEVICE_ID_GTCO_404 0x0405 +#define USB_DEVICE_ID_GTCO_405 0x0405 #define USB_DEVICE_ID_GTCO_500 0x0500 #define USB_DEVICE_ID_GTCO_501 0x0501 #define USB_DEVICE_ID_GTCO_502 0x0502 @@ -1657,7 +1657,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_402, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_403, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, - { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_404, HID_QUIRK_IGNORE }, + { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_405, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_500, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_501, HID_QUIRK_IGNORE }, { USB_VENDOR_ID_GTCO, USB_DEVICE_ID_GTCO_502, HID_QUIRK_IGNORE }, ------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 _______________________________________________ Linux-usb-users@lists.sourceforge.net To unsubscribe, use the last form field at: https://lists.sourceforge.net/lists/listinfo/linux-usb-users