public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] [USB] hid-core.c: Fix apparent typo in GTCO blacklist entries
@ 2006-09-04 16:30 Roland Dreier
  2006-09-04 18:08 ` Oleg Verych
  2006-09-05  8:15 ` Roberson, Jeremy
  0 siblings, 2 replies; 3+ messages in thread
From: Roland Dreier @ 2006-09-04 16:30 UTC (permalink / raw)
  To: gregkh; +Cc: linux-kernel, Gene Heskett, jroberson, linux-usb-users

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 <roland@digitalvampire.org>

---

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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2006-09-05  8:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-09-04 16:30 [PATCH] [USB] hid-core.c: Fix apparent typo in GTCO blacklist entries Roland Dreier
2006-09-04 18:08 ` Oleg Verych
2006-09-05  8:15 ` Roberson, Jeremy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox