LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] usb: serial: move zte MF330 from sierra to option
@ 2008-02-11 20:29 Kevin Lloyd
  2008-02-14 21:12 ` Andrew Morton
  0 siblings, 1 reply; 3+ messages in thread
From: Kevin Lloyd @ 2008-02-11 20:29 UTC (permalink / raw)
  To: gregkh; +Cc: linux-usb, linux-kernel, klloyd

From: Kevin Lloyd <linux@sierrawireless.com>

Moves the Onda H600/ZTE MF33 device from the sierra driver to the option driver.

Signed-off-by: Kevin Lloyd <klloyd@sierrawireless.com>

---
 drivers/usb/serial/sierra.c |   1 -
 drivers/usb/serial/option.c |   2 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- linux-2.6.25-rc1/drivers/usb/serial/sierra.c.orig	2008-02-11 11:34:06.000000000 -0800
+++ linux-2.6.25-rc1/drivers/usb/serial/sierra.c	2008-02-11 11:34:36.000000000 -0800
@@ -178,7 +178,6 @@ static struct usb_device_id id_table [] 
 
 	{ USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */
 	{ USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */
-	{ USB_DEVICE(0x05C6, 0x6613), .driver_info = DEVICE_1_PORT }, /* Onda H600/ZTE MF330 */
 
 	{ USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
 	{ }
--- linux-2.6.25-rc1/drivers/usb/serial/option.c.orig	2008-02-11 11:42:10.000000000 -0800
+++ linux-2.6.25-rc1/drivers/usb/serial/option.c	2008-02-11 11:42:18.000000000 -0800
@@ -121,6 +121,8 @@ static int  option_send_setup(struct usb
 #define BANDRICH_PRODUCT_C100_1			0x1002
 #define BANDRICH_PRODUCT_C100_2			0x1003
 
+#define QUALCOMM_VENDOR_ID			0x05C6
+
 static struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -186,6 +188,7 @@ static struct usb_device_id option_ids[]
 	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
 	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
 	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
+	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
 	{ } /* Terminating entry */
 };
 MODULE_DEVICE_TABLE(usb, option_ids);


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] usb: serial: move zte MF330 from sierra to option
  2008-02-11 20:29 [PATCH] usb: serial: move zte MF330 from sierra to option Kevin Lloyd
@ 2008-02-14 21:12 ` Andrew Morton
  2008-02-14 21:25   ` Greg KH
  0 siblings, 1 reply; 3+ messages in thread
From: Andrew Morton @ 2008-02-14 21:12 UTC (permalink / raw)
  To: Kevin Lloyd; +Cc: gregkh, linux-usb, linux-kernel, klloyd

On Mon, 11 Feb 2008 12:29:33 -0800
Kevin Lloyd <klloyd@sierrawireless.com> wrote:

> From: Kevin Lloyd <linux@sierrawireless.com>
> 
> Moves the Onda H600/ZTE MF33 device from the sierra driver to the option driver.
> 

A changelog should describe why a change was made, not simply what the
change is.

> 
> ---
>  drivers/usb/serial/sierra.c |   1 -
>  drivers/usb/serial/option.c |   2 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> --- linux-2.6.25-rc1/drivers/usb/serial/sierra.c.orig	2008-02-11 11:34:06.000000000 -0800
> +++ linux-2.6.25-rc1/drivers/usb/serial/sierra.c	2008-02-11 11:34:36.000000000 -0800
> @@ -178,7 +178,6 @@ static struct usb_device_id id_table [] 
>  
>  	{ USB_DEVICE(0x1199, 0x0112), .driver_info = DEVICE_1_PORT }, /* Sierra Wireless AirCard 580 */
>  	{ USB_DEVICE(0x0F3D, 0x0112), .driver_info = DEVICE_1_PORT }, /* Airprime/Sierra PC 5220 */
> -	{ USB_DEVICE(0x05C6, 0x6613), .driver_info = DEVICE_1_PORT }, /* Onda H600/ZTE MF330 */
>  
>  	{ USB_DEVICE(0x1199, 0x0FFF), .driver_info = DEVICE_INSTALLER},
>  	{ }
> --- linux-2.6.25-rc1/drivers/usb/serial/option.c.orig	2008-02-11 11:42:10.000000000 -0800
> +++ linux-2.6.25-rc1/drivers/usb/serial/option.c	2008-02-11 11:42:18.000000000 -0800
> @@ -121,6 +121,8 @@ static int  option_send_setup(struct usb
>  #define BANDRICH_PRODUCT_C100_1			0x1002
>  #define BANDRICH_PRODUCT_C100_2			0x1003
>  
> +#define QUALCOMM_VENDOR_ID			0x05C6
> +
>  static struct usb_device_id option_ids[] = {
>  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
>  	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
> @@ -186,6 +188,7 @@ static struct usb_device_id option_ids[]
>  	{ USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
>  	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) },
>  	{ USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) },
> +	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x6613)}, /* Onda H600/ZTE MF330 */
>  	{ } /* Terminating entry */
>  };
>  MODULE_DEVICE_TABLE(usb, option_ids);

Because I, for one, don't have a clue why you did this?

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] usb: serial: move zte MF330 from sierra to option
  2008-02-14 21:12 ` Andrew Morton
@ 2008-02-14 21:25   ` Greg KH
  0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2008-02-14 21:25 UTC (permalink / raw)
  To: Andrew Morton; +Cc: Kevin Lloyd, linux-usb, linux-kernel

On Thu, Feb 14, 2008 at 01:12:28PM -0800, Andrew Morton wrote:
> On Mon, 11 Feb 2008 12:29:33 -0800
> Kevin Lloyd <klloyd@sierrawireless.com> wrote:
> 
> > From: Kevin Lloyd <linux@sierrawireless.com>
> > 
> > Moves the Onda H600/ZTE MF33 device from the sierra driver to the option driver.
> > 
> 
> A changelog should describe why a change was made, not simply what the
> change is.

I know the history behind it, I'll flush it out when I add it to my
tree.  Kevin sent this patch because I asked for it, so I'll take the
blame here.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2008-02-14 21:27 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-02-11 20:29 [PATCH] usb: serial: move zte MF330 from sierra to option Kevin Lloyd
2008-02-14 21:12 ` Andrew Morton
2008-02-14 21:25   ` Greg KH

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).