Skip to contentSkip to conversation

hid-core.c: Fix apparent typo in GTCO blacklist entries

PATCH In review Roland Dreier 3 participants 3 messages Sep 4, 2006 – Sep 5, 2006 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hid-core.c: Fix apparent typo in GTCO blacklist entries

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.

---

drivers/usb/input/hid-core.c +2 -2
index acb24c6..a2c56b2 100644
@@ -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 },
#1 lore raw
Quoted 6 lines · Roland Dreier

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:

Quoted 7 lines
    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.

It was patched today already.
<http://permalink.gmane.org/gmane.linux.kernel/443314>

Signature · 3 lines
-o--=O`C
 #oo'L O $ dd </all:xml>/dev/null
<___=E M
#2 lore raw
In reply to Roland Dreier

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: [email protected]; Gene Heskett; Roberson, Jeremy; [email protected]
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.

---

drivers/usb/input/hid-core.c +2 -2
index acb24c6..a2c56b2 100644
@@ -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 },