Skip to contentSkip to conversation

drivers/usb/input/hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404

PATCH Applied Adrian Bunk 3 participants 3 messages Sep 4, 2006 USB

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drivers/usb/input/hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404

Quoted 7 lines · Andrew Morton

...
Changes since 2.6.18-rc4-mm3:
...
+gregkh-usb-hid-core.c-adds-all-gtco-calcomp-digitizers-and-interwrite-school-products-to-blacklist.patch
...
USB tree updates.
...

The GNU C compiler spotted the following bug:

<-- snip -->

...
CC drivers/usb/input/hid-core.o
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1446:1: warning: "USB_DEVICE_ID_GTCO_404" redefined /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1445:1: warning: this is the location of the previous definition
...

<-- snip -->

This patch fixes this cut'n'paste error.

drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c.old +2 -2
@@ -1443,7 +1443,7 @@
 #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
@@ -1663,7 +1663,7 @@
 	{ 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 },
Signature · 1 line
VGER BF report: U 0.499995
#1 lore raw
Quoted 19 lines · Adrian Bunk
Quoted 7 lines · Andrew Morton

...
Changes since 2.6.18-rc4-mm3:
...
+gregkh-usb-hid-core.c-adds-all-gtco-calcomp-digitizers-and-interwrite-school-products-to-blacklist.patch
...
USB tree updates.
...

The GNU C compiler spotted the following bug:

<-- snip -->

...
CC drivers/usb/input/hid-core.o
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1446:1: warning: "USB_DEVICE_ID_GTCO_404" redefined /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c:1445:1: warning: this is the location of the previous definition
...

Quoted 3 lines

<-- snip -->

This patch fixes this cut'n'paste error.

Thanks, Adrian. Greg, please apply.

Quoted 26 lines
drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c.old +2 -2
@@ -1443,7 +1443,7 @@
 #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
@@ -1663,7 +1663,7 @@
 	{ 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 },
Signature · 5 lines
Vojtech Pavlik
Director SuSE Labs

-- 
VGER BF report: H 0.0165713
Applied
#2 lore raw
In reply to Adrian Bunk
Quoted 40 lines · Adrian Bunk
Quoted 7 lines · Andrew Morton

...
Changes since 2.6.18-rc4-mm3:
...
+gregkh-usb-hid-core.c-adds-all-gtco-calcomp-digitizers-and-interwrite- school-products-to-blacklist.patch ...
USB tree updates.
...

The GNU C compiler spotted the following bug:

<-- snip -->

...
CC drivers/usb/input/hid-core.o
/home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-co re.c:1446:1: warning: "USB_DEVICE_ID_GTCO_404" redefined /home/bunk/linux/kernel-2.6/linux-2.6.18-rc5-mm1/drivers/usb/input/hid-c ore.c:1445:1: warning: this is the location of the previous definition
...

<-- snip -->

This patch fixes this cut'n'paste error.

--- linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c.old 2006-09-03 21:00:25.000000000 +0200 +++ linux-2.6.18-rc5-mm1/drivers/usb/input/hid-core.c 2006-09-03 21:00:44.000000000 +0200 @@ -1443,7 +1443,7 @@

#define USB_DEVICE_ID_GTCO_402  0x0402
#define USB_DEVICE_ID_GTCO_403  0x0403
#define USB_DEVICE_ID_GTCO_404  0x0404
drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c.old +1 -1
-#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

drivers/usb/input/hid-core.c line 1669

Quoted 8 lines
drivers/usb/input/hid-core.c renamed from drivers/usb/input/hid-core.c.old +1 -1
@@ -1663,7 +1663,7 @@
 { 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 },

Thanks, applied, Just Works(TM).

Signature · 7 lines
Cheers, Gene
"There are four boxes to be used in defense of liberty:
 soap, ballot, jury, and ammo. Please use in that order."
-Ed Howdershelt (Author)
Yahoo.com and AOL/TW attorneys please note, additions to the above
message by Gene Heskett are:
Copyright 2006 by Maurice Eugene Heskett, all rights reserved.