Accueil Explorer Aide
S'inscrire Connexion
phyus
/
linux-vybrid_public
8
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Parcourir la source

USB: hid-core.c: fix duplicate USB_DEVICE_ID_GTCO_404

On Fri, Sep 01, 2006 at 01:58:18AM -0700, Andrew Morton wrote:
>...
> 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.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Adrian Bunk il y a 18 ans
Parent
10387e5eb4
commit
f064902457
1 fichiers modifiés avec 2 ajouts et 2 suppressions
Vue séparée Afficher les stats Diff
  1. 2 2
      drivers/usb/input/hid-core.c

+ 2 - 2
drivers/usb/input/hid-core.c
Voir le fichier 

@@ -1444,7 +1444,7 @@ void hid_init_reports(struct hid_device *hid)
 
 #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 },