diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-20 21:34:38 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-02-20 21:34:38 -0800 |
| commit | e7b74933924610a7d14af135e875f91afae937e0 (patch) | |
| tree | e8a607a65c979c86363940e34782d611a0af802f | |
| parent | c5fcad2ba92ed864af435864b88fd3ffac12a568 (diff) | |
| download | patches-e7b74933924610a7d14af135e875f91afae937e0.tar.gz | |
usb patch
| -rw-r--r-- | series | 1 | ||||
| -rw-r--r-- | usb.current/usb-option-add-benq-3g-modem-information.patch | 39 | ||||
| -rw-r--r-- | usb/usb-suspend-resume-support-for-option-driver.patch | 14 |
3 files changed, 47 insertions, 7 deletions
@@ -18,6 +18,7 @@ gregkh.pre/detect-atomic-counter-underflows.patch usb.current/usb-fsl_usb2_udc-fix-potential-queue-head-corruption.patch usb.current/usb-ehci-slow-down-itd-reuse.patch usb.current/usb-gadget-obex-select-correct-ep-descriptors.patch +usb.current/usb-option-add-benq-3g-modem-information.patch ##################################################################### # Stuff to be merged after 2.6.29 is out diff --git a/usb.current/usb-option-add-benq-3g-modem-information.patch b/usb.current/usb-option-add-benq-3g-modem-information.patch new file mode 100644 index 00000000000000..81907360fbd8b2 --- /dev/null +++ b/usb.current/usb-option-add-benq-3g-modem-information.patch @@ -0,0 +1,39 @@ +From foo@baz Fri Feb 20 21:13:45 PST 2009 +Date: Fri, 20 Feb 2009 21:13:45 -0800 +To: Greg KH <greg@kroah.com> +From: Jesse Sung <jsung@novell.com> +Subject: USB: option: add BenQ 3g modem information +References: bnc#473918 + +This patch addes the BenQ 3g modem support to the option driver. + + +From: Jesse Sung <jsung@novell.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -296,6 +296,9 @@ static int option_send_setup(struct tty + #define ERICSSON_VENDOR_ID 0x0bdb + #define ERICSSON_PRODUCT_F3507G 0x1900 + ++#define BENQ_VENDOR_ID 0x04a5 ++#define BENQ_PRODUCT_H10 0x4068 ++ + static struct usb_device_id option_ids[] = { + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) }, + { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) }, +@@ -510,6 +513,8 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_MF628) }, + { USB_DEVICE(ZTE_VENDOR_ID, ZTE_PRODUCT_CDMA_TECH) }, + { USB_DEVICE(ERICSSON_VENDOR_ID, ERICSSON_PRODUCT_F3507G) }, ++ { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_H10) }, ++ { USB_DEVICE(0x1da5, 0x4515) }, /* BenQ H20 */ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/usb/usb-suspend-resume-support-for-option-driver.patch b/usb/usb-suspend-resume-support-for-option-driver.patch index 84e866f19981b7..11a2074bcb07f9 100644 --- a/usb/usb-suspend-resume-support-for-option-driver.patch +++ b/usb/usb-suspend-resume-support-for-option-driver.patch @@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Vendor and product IDs */ #define OPTION_VENDOR_ID 0x0AF0 -@@ -518,6 +520,8 @@ static struct usb_driver option_driver = +@@ -523,6 +525,8 @@ static struct usb_driver option_driver = .name = "option", .probe = usb_serial_probe, .disconnect = usb_serial_disconnect, @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .id_table = option_ids, .no_dynamic_id = 1, }; -@@ -546,6 +550,8 @@ static struct usb_serial_driver option_1 +@@ -551,6 +555,8 @@ static struct usb_serial_driver option_1 .attach = option_startup, .shutdown = option_shutdown, .read_int_callback = option_instat_callback, @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> }; static int debug; -@@ -816,10 +822,10 @@ static void option_instat_callback(struc +@@ -821,10 +827,10 @@ static void option_instat_callback(struc req_pkt->bRequestType, req_pkt->bRequest); } } else @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> urb->dev = serial->dev; err = usb_submit_urb(urb, GFP_ATOMIC); if (err) -@@ -838,7 +844,6 @@ static int option_write_room(struct tty_ +@@ -843,7 +849,6 @@ static int option_write_room(struct tty_ portdata = usb_get_serial_port_data(port); @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < N_OUT_URB; i++) { this_urb = portdata->out_urbs[i]; if (this_urb && !test_bit(i, &portdata->out_busy)) -@@ -1100,14 +1105,12 @@ bail_out_error: +@@ -1105,14 +1110,12 @@ bail_out_error: return 1; } @@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Stop reading/writing urbs */ for (i = 0; i < serial->num_ports; ++i) { port = serial->port[i]; -@@ -1117,6 +1120,17 @@ static void option_shutdown(struct usb_s +@@ -1122,6 +1125,17 @@ static void option_shutdown(struct usb_s for (j = 0; j < N_OUT_URB; j++) usb_kill_urb(portdata->out_urbs[j]); } @@ -106,7 +106,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Now free them */ for (i = 0; i < serial->num_ports; ++i) { -@@ -1147,6 +1161,66 @@ static void option_shutdown(struct usb_s +@@ -1152,6 +1166,66 @@ static void option_shutdown(struct usb_s } } |