Skip to contentSkip to conversation

Comment out duplicate device entry

PATCH In review Ben Collins 3 participants 3 messages Jun 26, 2008 – Jun 30, 2008 Networking drivers (wireless)

lore
Share & tools
lore

Ben Collins

author
#0 lore raw

PATCH 1/1 Comment out duplicate device entry

Left it commented instead of removing since it referenced a different model name. Just avoid it getting back in by mistake, and to document that it is supported.

Signed-off-by Ben Collins <[email protected]>
drivers/net/wireless/p54/p54usb.c +1 -1
index 1610a73..f0369d0 100644
@@ -60,7 +60,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
 	{USB_DEVICE(0x0915, 0x2002)},	/* Cohiba Proto board */
 	{USB_DEVICE(0x0baf, 0x0118)},   /* U.S. Robotics U5 802.11g Adapter*/
 	{USB_DEVICE(0x0bf8, 0x1009)},   /* FUJITSU E-5400 USB D1700*/
-	{USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
+// DUPE	{USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
 	{USB_DEVICE(0x0cde, 0x0008)},	/* Sagem XG703A */
 	{USB_DEVICE(0x0d8e, 0x3762)},	/* DLink DWL-G120 Cohiba */
 	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */
#1 lore raw
Quoted 3 lines · Ben Collins

Left it commented instead of removing since it referenced a different model name. Just avoid it getting back in by mistake, and to document that it is supported.

No, it's the same the same model name (MD stands for Medion).

But it shouldn't be listed as both version 1 and version 2 device.

I've added the driver maintainer to the Cc.

Quoted 7 lines
Signed-off-by Ben Collins <[email protected]>
drivers/net/wireless/p54/p54usb.c +0 -0
index 1610a73..f0369d0 100644

drivers/net/wireless/p54/p54usb.c static struct usb_device_id p54u_table[] __devinitdata = { · line 66

Quoted 8 lines
drivers/net/wireless/p54/p54usb.c +1 -1
@@ -60,7 +60,7 @@ static struct usb_device_id p54u_table[] __devinitdata = {
 	{USB_DEVICE(0x0915, 0x2002)},	/* Cohiba Proto board */
 	{USB_DEVICE(0x0baf, 0x0118)},   /* U.S. Robotics U5 802.11g Adapter*/
 	{USB_DEVICE(0x0bf8, 0x1009)},   /* FUJITSU E-5400 USB D1700*/
-	{USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
+// DUPE	{USB_DEVICE(0x0cde, 0x0006)},   /* Medion MD40900 */
 	{USB_DEVICE(0x0cde, 0x0008)},	/* Sagem XG703A */
 	{USB_DEVICE(0x0d8e, 0x3762)},	/* DLink DWL-G120 Cohiba */
 	{USB_DEVICE(0x09aa, 0x1000)},	/* Spinnaker Proto board */

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#2 lore raw
Quoted 2 lines · On Thursday 26 June 2008 12:11:52 Adrian Bunk wrote:

But it shouldn't be listed as both version 1 and version 2 device.

It could be both! They're a bit lazy about changing usb/pci ids with different cards anyway so I wouldn't be surprised. The driver differentiates the device version using a more reliable method anyway so it doesn't matter. This device id list was just copied from the islsm driver so I can't say for sure if there's both version 1 and version 2 devices sharing the same usb id.

-Michael Wu