2008-06-26 15:57:29

by Ben Collins

[permalink] [raw]
Subject: [PATCH] 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]>

diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 1610a73..f0369d0 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -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 */


2008-06-26 16:14:19

by Adrian Bunk

[permalink] [raw]
Subject: Re: [PATCH] Comment out duplicate device entry

On Thu, Jun 26, 2008 at 11:57:18AM -0400, Ben Collins wrote:
> 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.

> Signed-off-by: Ben Collins <[email protected]>
>
> diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
> index 1610a73..f0369d0 100644
> --- a/drivers/net/wireless/p54/p54usb.c
> +++ b/drivers/net/wireless/p54/p54usb.c
> @@ -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

--

"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

2008-06-30 03:34:29

by Michael Wu

[permalink] [raw]
Subject: Re: [PATCH] Comment out duplicate device entry

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


Attachments:
(No filename) (519.00 B)
signature.asc (194.00 B)
This is a digitally signed message part.
Download all attachments