diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-14 15:00:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-04-14 15:00:44 -0700 |
| commit | 07ea28115325b249b1c295f69ad84a0e2e153f9c (patch) | |
| tree | 4d5b3f4414953adbf8f44518630e8d50c4bdd690 | |
| parent | da159ba8524e14dc6d9adc5649d6e1c661eb9b8a (diff) | |
| download | patches-07ea28115325b249b1c295f69ad84a0e2e153f9c.tar.gz | |
usb patches added
9 files changed, 157 insertions, 40 deletions
@@ -116,6 +116,8 @@ pci/pci-replace-remaining-__function__-occurrences.patch usb/usb-obscure-maxon-bp3-usb-device-support-16d8-6280-for-option-driver.patch usb/usb-option.c-add-more-device-ids.patch usb/usb-support-more-huawei-data-card-product-ids.patch +usb/usb-option-add-new-vendor-id-and-device-id-for-amoi-hsdpa-modem.patch +usb/usb-remove-broken-usb-serial-num_endpoints-check.patch # resume rework usb/usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch @@ -126,6 +128,7 @@ usb/usb-check-serial-number-string-after-device-reset.patch usb/usb-enable-usb-persist-by-default.patch # usb stuff for after 2.6.25 is out +usb/checkpatch-usb_free_urb-can-take-null.patch usb/usb-add-usb_dt_cs_radio_control-define-to-ch9.h.patch usb/usb-convert-usb.h-struct-usb_device-to-kernel-doc.patch usb/usb-microtek-remove-unused-semaphore.patch diff --git a/usb/checkpatch-usb_free_urb-can-take-null.patch b/usb/checkpatch-usb_free_urb-can-take-null.patch new file mode 100644 index 00000000000000..5e33a53c7ddf4d --- /dev/null +++ b/usb/checkpatch-usb_free_urb-can-take-null.patch @@ -0,0 +1,30 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Mon, 14 Apr 2008 14:17:29 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: checkpatch: usb_free_urb() can take NULL + +usb_free_urb() can take a NULL, so let's check and warn about that. + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + scripts/checkpatch.pl | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/scripts/checkpatch.pl ++++ b/scripts/checkpatch.pl +@@ -1889,6 +1889,13 @@ sub process { + WARN("kfree(NULL) is safe this check is probabally not required\n" . $hereprev); + } + } ++# check for needless usb_free_urb() checks ++ if ($prevline =~ /\bif\s*\(([^\)]*)\)/) { ++ my $expr = $1; ++ if ($line =~ /\busb_free_urb\(\Q$expr\E\);/) { ++ WARN("usb_free_urb(NULL) is safe this check is probabally not required\n" . $hereprev); ++ } ++ } + + # warn about #ifdefs in C files + # if ($line =~ /^.#\s*if(|n)def/ && ($realfile =~ /\.c$/)) { diff --git a/usb/usb-option-add-new-vendor-id-and-device-id-for-amoi-hsdpa-modem.patch b/usb/usb-option-add-new-vendor-id-and-device-id-for-amoi-hsdpa-modem.patch new file mode 100644 index 00000000000000..30260f751b7476 --- /dev/null +++ b/usb/usb-option-add-new-vendor-id-and-device-id-for-amoi-hsdpa-modem.patch @@ -0,0 +1,42 @@ +From tangk73@hotmail.com Mon Apr 14 14:56:30 2008 +From: tang kai <tangk73@hotmail.com> +Date: Mon, 14 Apr 2008 10:06:35 +0800 +Subject: USB: option: Add new vendor ID and device ID for AMOI HSDPA modem +To: <linux-usb@vger.kernel.org> +Message-ID: <BAY110-W34DF6A2D2B07A184A06E2EBCE80@phx.gbl> + +This patch add new vendor ID and device ID for AMOI HSDPA modem. + +From: tang kai <tangk73@hotmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -166,6 +166,12 @@ static int option_send_setup(struct usb + #define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001 + #define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001 + ++/* AMOI PRODUCTS */ ++#define AMOI_VENDOR_ID 0x1614 ++#define AMOI_PRODUCT_H01 0x0800 ++#define AMOI_PRODUCT_H01A 0x7002 ++#define AMOI_PRODUCT_H02 0x0802 ++ + #define DELL_VENDOR_ID 0x413C + + #define KYOCERA_VENDOR_ID 0x0c88 +@@ -273,6 +279,10 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_2) }, /* Novatel Embedded product */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_2) }, /* Novatel Global product */ + ++ { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) }, ++ { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) }, ++ { USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H02) }, ++ + { USB_DEVICE(DELL_VENDOR_ID, 0x8114) }, /* Dell Wireless 5700 Mobile Broadband CDMA/EVDO Mini-Card == Novatel Expedite EV620 CDMA/EV-DO */ + { USB_DEVICE(DELL_VENDOR_ID, 0x8115) }, /* Dell Wireless 5500 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ + { USB_DEVICE(DELL_VENDOR_ID, 0x8116) }, /* Dell Wireless 5505 Mobile Broadband HSDPA Mini-Card == Novatel Expedite EU740 HSDPA/3G */ diff --git a/usb/usb-option.c-correct-dtr-behaviour.patch b/usb/usb-option.c-correct-dtr-behaviour.patch index 3e411c25ffd3e6..5b7936ba584917 100644 --- a/usb/usb-option.c-correct-dtr-behaviour.patch +++ b/usb/usb-option.c-correct-dtr-behaviour.patch @@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define DRIVER_AUTHOR "Matthias Urlichs <smurf@smurf.noris.de>" #define DRIVER_DESC "USB Driver for GSM modems" -@@ -814,16 +814,19 @@ static void option_setup_urbs(struct usb +@@ -824,16 +824,19 @@ static void option_setup_urbs(struct usb } } @@ -58,7 +58,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata = usb_get_serial_port_data(port); if (port->tty) { -@@ -835,7 +838,7 @@ static int option_send_setup(struct usb_ +@@ -845,7 +848,7 @@ static int option_send_setup(struct usb_ return usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0), diff --git a/usb/usb-remove-broken-usb-serial-num_endpoints-check.patch b/usb/usb-remove-broken-usb-serial-num_endpoints-check.patch new file mode 100644 index 00000000000000..948a212dfc3c70 --- /dev/null +++ b/usb/usb-remove-broken-usb-serial-num_endpoints-check.patch @@ -0,0 +1,42 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Mon, 14 Apr 2008 14:17:29 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: USB: remove broken usb-serial num_endpoints check + +The num_interrupt_in, num_bulk_in, and other checks in the usb-serial +code are just wrong, there are too many different devices out there with +different numbers of endpoints. We need to just be sticking with the +device ids instead of trying to catch this kind of thing. It broke too +many different devices. + +This fixes a large number of usb-serial devices to get them working +properly again. + + +Cc: Oliver Neukum <oliver@neukum.org> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/usb-serial.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/usb-serial.c ++++ b/drivers/usb/serial/usb-serial.c +@@ -854,6 +854,7 @@ int usb_serial_probe(struct usb_interfac + serial->num_interrupt_in = num_interrupt_in; + serial->num_interrupt_out = num_interrupt_out; + ++#if 0 + /* check that the device meets the driver's requirements */ + if ((type->num_interrupt_in != NUM_DONT_CARE && + type->num_interrupt_in != num_interrupt_in) +@@ -867,6 +868,7 @@ int usb_serial_probe(struct usb_interfac + kfree(serial); + return -EIO; + } ++#endif + + /* found all that we need */ + dev_info(&interface->dev, "%s converter detected\n", diff --git a/usb/usb-remove-unnecessary-type-casting-of-urb-context.patch b/usb/usb-remove-unnecessary-type-casting-of-urb-context.patch index d85aad318d1340..effc0bc27592b4 100644 --- a/usb/usb-remove-unnecessary-type-casting-of-urb-context.patch +++ b/usb/usb-remove-unnecessary-type-casting-of-urb-context.patch @@ -810,7 +810,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> dbg("%s - port %0x\n", __func__, port->number); --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -538,7 +538,7 @@ static void option_indat_callback(struct +@@ -548,7 +548,7 @@ static void option_indat_callback(struct dbg("%s: %p", __func__, urb); endpoint = usb_pipeendpoint(urb->pipe); @@ -819,7 +819,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (status) { dbg("%s: nonzero status: %d on endpoint %02x.", -@@ -572,7 +572,7 @@ static void option_outdat_callback(struc +@@ -582,7 +582,7 @@ static void option_outdat_callback(struc dbg("%s", __func__); @@ -828,7 +828,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_serial_port_softint(port); -@@ -590,7 +590,7 @@ static void option_instat_callback(struc +@@ -600,7 +600,7 @@ static void option_instat_callback(struc { int err; int status = urb->status; diff --git a/usb/usb-replace-remaining-__function__-occurrences.patch b/usb/usb-replace-remaining-__function__-occurrences.patch index 2b8cafbca056f6..f01fac61840ab4 100644 --- a/usb/usb-replace-remaining-__function__-occurrences.patch +++ b/usb/usb-replace-remaining-__function__-occurrences.patch @@ -13688,7 +13688,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> kfree(usb_get_serial_port_data(port)); --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -401,24 +401,24 @@ module_exit(option_exit); +@@ -411,24 +411,24 @@ module_exit(option_exit); static void option_rx_throttle(struct usb_serial_port *port) { @@ -13717,7 +13717,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Doesn't support option setting */ tty_termios_copy_hw(port->tty->termios, old_termios); option_send_setup(port); -@@ -479,7 +479,7 @@ static int option_write(struct usb_seria +@@ -489,7 +489,7 @@ static int option_write(struct usb_seria portdata = usb_get_serial_port_data(port); @@ -13726,7 +13726,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> i = 0; left = count; -@@ -500,7 +500,7 @@ static int option_write(struct usb_seria +@@ -510,7 +510,7 @@ static int option_write(struct usb_seria dbg("usb_write %p failed (err=%d)", this_urb, this_urb->status); @@ -13735,7 +13735,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_pipeendpoint(this_urb->pipe), i); /* send the data */ -@@ -522,7 +522,7 @@ static int option_write(struct usb_seria +@@ -532,7 +532,7 @@ static int option_write(struct usb_seria } count -= left; @@ -13744,7 +13744,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return count; } -@@ -535,14 +535,14 @@ static void option_indat_callback(struct +@@ -545,14 +545,14 @@ static void option_indat_callback(struct unsigned char *data = urb->transfer_buffer; int status = urb->status; @@ -13761,7 +13761,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } else { tty = port->tty; if (urb->actual_length) { -@@ -550,7 +550,7 @@ static void option_indat_callback(struct +@@ -560,7 +560,7 @@ static void option_indat_callback(struct tty_insert_flip_string(tty, data, urb->actual_length); tty_flip_buffer_push(tty); } else { @@ -13770,7 +13770,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Resubmit urb so we continue receiving */ -@@ -558,7 +558,7 @@ static void option_indat_callback(struct +@@ -568,7 +568,7 @@ static void option_indat_callback(struct err = usb_submit_urb(urb, GFP_ATOMIC); if (err) printk(KERN_ERR "%s: resubmit read urb failed. " @@ -13779,7 +13779,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } return; -@@ -570,7 +570,7 @@ static void option_outdat_callback(struc +@@ -580,7 +580,7 @@ static void option_outdat_callback(struc struct option_port_private *portdata; int i; @@ -13788,7 +13788,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> port = (struct usb_serial_port *) urb->context; -@@ -594,15 +594,15 @@ static void option_instat_callback(struc +@@ -604,15 +604,15 @@ static void option_instat_callback(struc struct option_port_private *portdata = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; @@ -13807,7 +13807,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } if ((req_pkt->bRequestType == 0xA1) && -@@ -612,7 +612,7 @@ static void option_instat_callback(struc +@@ -622,7 +622,7 @@ static void option_instat_callback(struc urb->transfer_buffer + sizeof(struct usb_ctrlrequest)); @@ -13816,7 +13816,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> old_dcd_state = portdata->dcd_state; portdata->cts_state = 1; -@@ -624,11 +624,11 @@ static void option_instat_callback(struc +@@ -634,11 +634,11 @@ static void option_instat_callback(struc old_dcd_state && !portdata->dcd_state) tty_hangup(port->tty); } else { @@ -13830,7 +13830,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Resubmit urb so we continue receiving IRQ data */ if (status != -ESHUTDOWN) { -@@ -636,7 +636,7 @@ static void option_instat_callback(struc +@@ -646,7 +646,7 @@ static void option_instat_callback(struc err = usb_submit_urb(urb, GFP_ATOMIC); if (err) dbg("%s: resubmit intr urb failed. (%d)", @@ -13839,7 +13839,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -655,7 +655,7 @@ static int option_write_room(struct usb_ +@@ -665,7 +665,7 @@ static int option_write_room(struct usb_ data_len += OUT_BUFLEN; } @@ -13848,7 +13848,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return data_len; } -@@ -673,7 +673,7 @@ static int option_chars_in_buffer(struct +@@ -683,7 +683,7 @@ static int option_chars_in_buffer(struct if (this_urb && test_bit(i, &portdata->out_busy)) data_len += this_urb->transfer_buffer_length; } @@ -13857,7 +13857,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return data_len; } -@@ -686,7 +686,7 @@ static int option_open(struct usb_serial +@@ -696,7 +696,7 @@ static int option_open(struct usb_serial portdata = usb_get_serial_port_data(port); @@ -13866,7 +13866,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Set some sane defaults */ portdata->rts_state = 1; -@@ -698,7 +698,7 @@ static int option_open(struct usb_serial +@@ -708,7 +708,7 @@ static int option_open(struct usb_serial if (! urb) continue; if (urb->dev != serial->dev) { @@ -13875,7 +13875,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> urb->dev, serial->dev); continue; } -@@ -712,7 +712,7 @@ static int option_open(struct usb_serial +@@ -722,7 +722,7 @@ static int option_open(struct usb_serial err = usb_submit_urb(urb, GFP_KERNEL); if (err) { dbg("%s: submit urb %d failed (%d) %d", @@ -13884,7 +13884,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> urb->transfer_buffer_length); } } -@@ -740,7 +740,7 @@ static void option_close(struct usb_seri +@@ -750,7 +750,7 @@ static void option_close(struct usb_seri struct usb_serial *serial = port->serial; struct option_port_private *portdata; @@ -13893,7 +13893,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata = usb_get_serial_port_data(port); portdata->rts_state = 0; -@@ -773,7 +773,7 @@ static struct urb *option_setup_urb(stru +@@ -783,7 +783,7 @@ static struct urb *option_setup_urb(stru urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */ if (urb == NULL) { @@ -13902,7 +13902,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return NULL; } -@@ -792,7 +792,7 @@ static void option_setup_urbs(struct usb +@@ -802,7 +802,7 @@ static void option_setup_urbs(struct usb struct usb_serial_port *port; struct option_port_private *portdata; @@ -13911,7 +13911,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; -@@ -825,7 +825,7 @@ static int option_send_setup(struct usb_ +@@ -835,7 +835,7 @@ static int option_send_setup(struct usb_ struct usb_serial *serial = port->serial; struct option_port_private *portdata; int ifNum = serial->interface->cur_altsetting->desc.bInterfaceNumber; @@ -13920,7 +13920,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata = usb_get_serial_port_data(port); -@@ -851,7 +851,7 @@ static int option_startup(struct usb_ser +@@ -861,7 +861,7 @@ static int option_startup(struct usb_ser struct option_port_private *portdata; u8 *buffer; @@ -13929,7 +13929,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Now setup per port private data */ for (i = 0; i < serial->num_ports; i++) { -@@ -859,7 +859,7 @@ static int option_startup(struct usb_ser +@@ -869,7 +869,7 @@ static int option_startup(struct usb_ser portdata = kzalloc(sizeof(*portdata), GFP_KERNEL); if (!portdata) { dbg("%s: kmalloc for option_port_private (%d) failed!.", @@ -13938,7 +13938,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return (1); } -@@ -884,7 +884,7 @@ static int option_startup(struct usb_ser +@@ -894,7 +894,7 @@ static int option_startup(struct usb_ser err = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); if (err) dbg("%s: submit irq_in urb failed %d", @@ -13947,7 +13947,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } option_setup_urbs(serial); -@@ -908,7 +908,7 @@ static void option_shutdown(struct usb_s +@@ -918,7 +918,7 @@ static void option_shutdown(struct usb_s struct usb_serial_port *port; struct option_port_private *portdata; @@ -16109,7 +16109,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return -ENOMEM; } -@@ -888,7 +888,7 @@ int usb_serial_probe(struct usb_interfac +@@ -890,7 +890,7 @@ int usb_serial_probe(struct usb_interfac serial->num_port_pointers = max_endpoints; unlock_kernel(); @@ -16118,7 +16118,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < max_endpoints; ++i) { port = kzalloc(sizeof(struct usb_serial_port), GFP_KERNEL); if (!port) -@@ -1036,7 +1036,7 @@ int usb_serial_probe(struct usb_interfac +@@ -1038,7 +1038,7 @@ int usb_serial_probe(struct usb_interfac port->dev.release = &port_release; snprintf (&port->dev.bus_id[0], sizeof(port->dev.bus_id), "ttyUSB%d", port->number); @@ -16127,7 +16127,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> retval = device_register(&port->dev); if (retval) dev_err(&port->dev, "Error registering port device, " -@@ -1095,7 +1095,7 @@ void usb_serial_disconnect(struct usb_in +@@ -1097,7 +1097,7 @@ void usb_serial_disconnect(struct usb_in struct usb_serial_port *port; usb_serial_console_disconnect(serial); @@ -16136,7 +16136,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mutex_lock(&serial->disc_mutex); usb_set_intfdata (interface, NULL); -@@ -1179,7 +1179,7 @@ static int __init usb_serial_init(void) +@@ -1181,7 +1181,7 @@ static int __init usb_serial_init(void) result = bus_register(&usb_serial_bus_type); if (result) { @@ -16145,7 +16145,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit_bus; } -@@ -1196,21 +1196,21 @@ static int __init usb_serial_init(void) +@@ -1198,21 +1198,21 @@ static int __init usb_serial_init(void) tty_set_operations(usb_serial_tty_driver, &serial_ops); result = tty_register_driver(usb_serial_tty_driver); if (result) { @@ -16170,7 +16170,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto exit_generic; } -@@ -1228,7 +1228,7 @@ exit_reg_driver: +@@ -1230,7 +1230,7 @@ exit_reg_driver: bus_unregister(&usb_serial_bus_type); exit_bus: diff --git a/usb/usb-serial-more-fixes-and-groundwork-for-tty-changes.patch b/usb/usb-serial-more-fixes-and-groundwork-for-tty-changes.patch index 6bdbbc82a26215..4aeb605e2bbdf7 100644 --- a/usb/usb-serial-more-fixes-and-groundwork-for-tty-changes.patch +++ b/usb/usb-serial-more-fixes-and-groundwork-for-tty-changes.patch @@ -438,7 +438,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -649,6 +649,7 @@ static int option_write_room(struct usb_ +@@ -659,6 +659,7 @@ static int option_write_room(struct usb_ portdata = usb_get_serial_port_data(port); @@ -446,7 +446,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)) -@@ -670,6 +671,8 @@ static int option_chars_in_buffer(struct +@@ -680,6 +681,8 @@ static int option_chars_in_buffer(struct for (i=0; i < N_OUT_URB; i++) { this_urb = portdata->out_urbs[i]; @@ -573,7 +573,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -1193,6 +1193,8 @@ static int __init usb_serial_init(void) +@@ -1195,6 +1195,8 @@ static int __init usb_serial_init(void) usb_serial_tty_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV; usb_serial_tty_driver->init_termios = tty_std_termios; usb_serial_tty_driver->init_termios.c_cflag = B9600 | CS8 | CREAD | HUPCL | CLOCAL; diff --git a/usb/usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch b/usb/usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch index 567db27bd4f23a..1f28644f6dd18f 100644 --- a/usb/usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch +++ b/usb/usb-serial-note-mos7480-and-option-don-t-lock-modem-status.patch @@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> mcr &= ~MCR_RTS; --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -448,6 +448,7 @@ static int option_tiocmset(struct usb_se +@@ -458,6 +458,7 @@ static int option_tiocmset(struct usb_se portdata = usb_get_serial_port_data(port); |