Return-path: Received: from adelie.canonical.com ([91.189.90.139]:34474 "EHLO adelie.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754915Ab0FOXjP (ORCPT ); Tue, 15 Jun 2010 19:39:15 -0400 Subject: [PATCH v2] p54usb: Comment out duplicate Medion MD40900 device id From: Leann Ogasawara To: "John W. Linville" Cc: Larry Finger , linux-wireless@vger.kernel.org, Ben Collins In-Reply-To: <20100615194610.GB2415@tuxdriver.com> References: <1276208913.1221.3646.camel@emiko> <4C1173E7.6010201@lwfinger.net> <20100614185549.GB2216@tuxdriver.com> <1276624745.6127.61.camel@emiko> <20100615194610.GB2415@tuxdriver.com> Content-Type: text/plain; charset="UTF-8" Date: Tue, 15 Jun 2010 16:39:08 -0700 Message-ID: <1276645148.6127.219.camel@emiko> Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Tue, 2010-06-15 at 15:46 -0400, John W. Linville wrote: > On Tue, Jun 15, 2010 at 10:59:05AM -0700, Leann Ogasawara wrote: > > On Mon, 2010-06-14 at 14:55 -0400, John W. Linville wrote: > > > > So, I guess you are concerned about the groupings because of the > > > different firmwares or something like that? Perhaps a comment that > > > says "this could be a version 2 device" is just as handy? Since the > > > driver prints the name of the firmware it wants, is there any real > > > need for grouping the IDs? > > > > > > OTOH, is there any actual harm from the duplicate entry? It "seems" > > > wrong to me too, but I guess it does no harm...? > > > > I don't believe there is any harm from the duplicate entry, it just > > seemed unnecessary. > > > > > Leann and/or Ben, was this just tidying-up? I'm guessing there wasn't > > > an actual bug involved? > > > > Indeed, this was just a patch we'd been carrying to tidy things up. > > There was no actual bug involved. I'd be happy to send a v2 of the > > patch which comments out the duplicate entry and adds a note as to why. > > Or I'd be fine just leaving the code as is and we'll drop the patch > > we're carrying locally in Ubuntu. > > FWIW, I like the 'comment-out and add a note' option. Here's the 'comment-out and add a note' option. Let me know if you'd prefer a different style formatting etc. Thanks, Leann >From 5d1b6029ffc0eb770cd34f7dd1a910451c0cda4d Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Tue, 15 Jun 2010 14:01:51 -0700 Subject: [PATCH] p54usb: Comment out duplicate Medion MD40900 device id The Medion MD40900 device id [0x0cde, 0x0006] is defined twice. Comment out the duplicate. Originally-by: Ben Collins Signed-off-by: Leann Ogasawara --- drivers/net/wireless/p54/p54usb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index 7307325..2d8d03d 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c @@ -69,7 +69,8 @@ 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 */ + /* {USB_DEVICE(0x0cde, 0x0006)}, * Medion MD40900 already listed above, + * just noting it here for clarity */ {USB_DEVICE(0x0cde, 0x0008)}, /* Sagem XG703A */ {USB_DEVICE(0x0cde, 0x0015)}, /* Zcomax XG-705A */ {USB_DEVICE(0x0d8e, 0x3762)}, /* DLink DWL-G120 Cohiba */ -- 1.7.0.4