diff options
10 files changed, 143 insertions, 36 deletions
diff --git a/greg-debugobjects-add-documentation.patch b/pending/greg-debugobjects-add-documentation.patch index b4b7655323d547..b4b7655323d547 100644 --- a/greg-debugobjects-add-documentation.patch +++ b/pending/greg-debugobjects-add-documentation.patch diff --git a/greg-debugobjects-add-timer-specific-object-debugging-code.patch b/pending/greg-debugobjects-add-timer-specific-object-debugging-code.patch index 7542d8bd2e72e1..7542d8bd2e72e1 100644 --- a/greg-debugobjects-add-timer-specific-object-debugging-code.patch +++ b/pending/greg-debugobjects-add-timer-specific-object-debugging-code.patch diff --git a/greg-infrastructure-to-debug-objects.patch b/pending/greg-infrastructure-to-debug-objects.patch index 4b1aee7af5799c..4b1aee7af5799c 100644 --- a/greg-infrastructure-to-debug-objects.patch +++ b/pending/greg-infrastructure-to-debug-objects.patch diff --git a/greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch b/pending/greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch index 512a092a754e81..512a092a754e81 100644 --- a/greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch +++ b/pending/greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch diff --git a/greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch b/pending/greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch index b4256a49ccc3dd..b4256a49ccc3dd 100644 --- a/greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch +++ b/pending/greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch @@ -82,6 +82,7 @@ usb/usb-fix-usb-serial-generic-recursive-lock.patch usb/usb-drivers-usb-storage-sddr55.c-fix-uninitialized-var-warnings.patch usb/usb-cypress_m8-add-ups-powercom.patch usb/usb-usbaudio-handle-kcalloc-failure.patch +usb/usb-option-add-novatel-device-ids.patch # resume rework usb/usb-ehci-carry-out-port-handover-during-each-root-hub-resume.patch @@ -146,14 +147,12 @@ driver-core/video-add-the-go7007-driver.patch #pending/block-make-genhd-use-the-new-class-iterator-functions.patch #pending/class-move-driver-core-specific-parts-to-a-private-structure.patch +#pending/greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch +#pending/greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch +#pending/greg-infrastructure-to-debug-objects.patch +#pending/greg-debugobjects-add-documentation.patch +#pending/greg-debugobjects-add-timer-specific-object-debugging-code.patch - -greg-vmalloc-do-not-check-for-freed-locks-on-user-maps.patch - -greg-slab-add-a-flag-to-prevent-debug_free-checks-on-a-kmem_cache.patch -greg-infrastructure-to-debug-objects.patch -greg-debugobjects-add-documentation.patch -greg-debugobjects-add-timer-specific-object-debugging-code.patch scsi-ib-convert-struct-class_device-to-struct-device.patch firmware-add-kconfig-and-makefile-to-build-the-firmware-samples.patch f2.patch diff --git a/usb/usb-option-add-novatel-device-ids.patch b/usb/usb-option-add-novatel-device-ids.patch new file mode 100644 index 00000000000000..3ce2b500c186ff --- /dev/null +++ b/usb/usb-option-add-novatel-device-ids.patch @@ -0,0 +1,108 @@ +From foo@baz Tue Apr 9 12:12:43 2002 +Date: Wed, 5 Mar 2008 08:26:18 -0000 +To: Greg KH <greg@kroah.com> +From: Dirk DeSchepper <ddeschepper@nvtl.com> +Subject: USB: option: add novatel device ids + +This updates the option driver with a lot more novatel driver ids. + +From: Dirk DeSchepper <ddeschepper@nvtl.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/option.c | 75 ++++++++++++++++++++++++++++++++++++-------- + 1 file changed, 62 insertions(+), 13 deletions(-) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -111,6 +111,42 @@ static int option_send_setup(struct usb + #define HUAWEI_PRODUCT_E220BIS 0x1004 + + #define NOVATELWIRELESS_VENDOR_ID 0x1410 ++ ++/* MERLIN EVDO PRODUCTS */ ++#define NOVATELWIRELESS_PRODUCT_V640 0x1100 ++#define NOVATELWIRELESS_PRODUCT_V620 0x1110 ++#define NOVATELWIRELESS_PRODUCT_V740 0x1120 ++#define NOVATELWIRELESS_PRODUCT_V720 0x1130 ++ ++/* MERLIN HSDPA/HSPA PRODUCTS */ ++#define NOVATELWIRELESS_PRODUCT_U730 0x1400 ++#define NOVATELWIRELESS_PRODUCT_U740 0x1410 ++#define NOVATELWIRELESS_PRODUCT_U870 0x1420 ++#define NOVATELWIRELESS_PRODUCT_XU870 0x1430 ++#define NOVATELWIRELESS_PRODUCT_X950D 0x1450 ++ ++/* EXPEDITE PRODUCTS */ ++#define NOVATELWIRELESS_PRODUCT_EV620 0x2100 ++#define NOVATELWIRELESS_PRODUCT_ES720 0x2110 ++#define NOVATELWIRELESS_PRODUCT_E725 0x2120 ++#define NOVATELWIRELESS_PRODUCT_EU730 0x2400 ++#define NOVATELWIRELESS_PRODUCT_EU740 0x2410 ++#define NOVATELWIRELESS_PRODUCT_EU870D 0x2420 ++ ++/* OVATION PRODUCTS */ ++#define NOVATELWIRELESS_PRODUCT_MC727 0x4100 ++#define NOVATELWIRELESS_PRODUCT_MC950D 0x4400 ++ ++/* FUTURE NOVATEL PRODUCTS */ ++#define NOVATELWIRELESS_PRODUCT_EVDO_1 0x6000 ++#define NOVATELWIRELESS_PRODUCT_HSPA_1 0x7000 ++#define NOVATELWIRELESS_PRODUCT_EMBEDDED_1 0x8000 ++#define NOVATELWIRELESS_PRODUCT_GLOBAL_1 0x9000 ++#define NOVATELWIRELESS_PRODUCT_EVDO_2 0x6001 ++#define NOVATELWIRELESS_PRODUCT_HSPA_2 0x7001 ++#define NOVATELWIRELESS_PRODUCT_EMBEDDED_2 0x8001 ++#define NOVATELWIRELESS_PRODUCT_GLOBAL_2 0x9001 ++ + #define DELL_VENDOR_ID 0x413C + + #define KYOCERA_VENDOR_ID 0x0c88 +@@ -168,21 +204,34 @@ static struct usb_device_id option_ids[] + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) }, +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1100) }, /* Novatel Merlin XS620/S640 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1110) }, /* Novatel Merlin S620 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1120) }, /* Novatel Merlin EX720 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1130) }, /* Novatel Merlin S720 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1400) }, /* Novatel U730 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1410) }, /* Novatel U740 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1420) }, /* Novatel EU870 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x1430) }, /* Novatel Merlin XU870 HSDPA/3G */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2100) }, /* Novatel EV620 CDMA/EV-DO */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2110) }, /* Novatel Merlin ES620 / Merlin ES720 / Ovation U720 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, /* Novatel Merlin V640/XV620 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, /* Novatel Merlin V620/S620 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, /* Novatel Merlin EX720/V740/X720 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V720) }, /* Novatel Merlin V720/S720/PC720 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U730) }, /* Novatel U730/U740 (VF version) */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U740) }, /* Novatel U740 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U870) }, /* Novatel U870 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_XU870) }, /* Novatel Merlin XU870 HSDPA/3G */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_X950D) }, /* Novatel X950D */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EV620) }, /* Novatel EV620/ES620 CDMA/EV-DO */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_ES720) }, /* Novatel ES620/ES720/U720/USB720 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E725) }, /* Novatel E725/E726 */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2130) }, /* Novatel Merlin ES620 SM Bus */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x2410) }, /* Novatel EU740 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4100) }, /* Novatel U727 */ +- { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x4400) }, /* Novatel MC950 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU730) }, /* Novatel EU730 and Vodafone EU740 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU740) }, /* Novatel non-Vodafone EU740 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EU870D) }, /* Novatel EU850D/EU860D/EU870D */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC950D) }, /* Novatel MC930D/MC950D */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_MC727) }, /* Novatel MC727/U727/USB727 */ + { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, 0x5010) }, /* Novatel U727 */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_1) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_1) }, /* Novatel HSPA product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EMBEDDED_1) }, /* Novatel Embedded product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_GLOBAL_1) }, /* Novatel Global product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_2) }, /* Novatel EVDO product */ ++ { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_2) }, /* Novatel HSPA product */ ++ { 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(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-remove-unnecessary-type-casting-of-urb-context.patch b/usb/usb-remove-unnecessary-type-casting-of-urb-context.patch index ce44cb62f91c5d..33402ae743c050 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 -@@ -447,7 +447,7 @@ static void option_indat_callback(struct +@@ -496,7 +496,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.", -@@ -481,7 +481,7 @@ static void option_outdat_callback(struc +@@ -530,7 +530,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); -@@ -499,7 +499,7 @@ static void option_instat_callback(struc +@@ -548,7 +548,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 4c5d31e44924c8..f1fee422ba0e44 100644 --- a/usb/usb-replace-remaining-__function__-occurrences.patch +++ b/usb/usb-replace-remaining-__function__-occurrences.patch @@ -13767,7 +13767,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 -@@ -310,24 +310,24 @@ module_exit(option_exit); +@@ -359,24 +359,24 @@ module_exit(option_exit); static void option_rx_throttle(struct usb_serial_port *port) { @@ -13796,7 +13796,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); -@@ -388,7 +388,7 @@ static int option_write(struct usb_seria +@@ -437,7 +437,7 @@ static int option_write(struct usb_seria portdata = usb_get_serial_port_data(port); @@ -13805,7 +13805,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> i = 0; left = count; -@@ -409,7 +409,7 @@ static int option_write(struct usb_seria +@@ -458,7 +458,7 @@ static int option_write(struct usb_seria dbg("usb_write %p failed (err=%d)", this_urb, this_urb->status); @@ -13814,7 +13814,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_pipeendpoint(this_urb->pipe), i); /* send the data */ -@@ -431,7 +431,7 @@ static int option_write(struct usb_seria +@@ -480,7 +480,7 @@ static int option_write(struct usb_seria } count -= left; @@ -13823,7 +13823,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return count; } -@@ -444,14 +444,14 @@ static void option_indat_callback(struct +@@ -493,14 +493,14 @@ static void option_indat_callback(struct unsigned char *data = urb->transfer_buffer; int status = urb->status; @@ -13840,7 +13840,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } else { tty = port->tty; if (urb->actual_length) { -@@ -459,7 +459,7 @@ static void option_indat_callback(struct +@@ -508,7 +508,7 @@ static void option_indat_callback(struct tty_insert_flip_string(tty, data, urb->actual_length); tty_flip_buffer_push(tty); } else { @@ -13849,7 +13849,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /* Resubmit urb so we continue receiving */ -@@ -467,7 +467,7 @@ static void option_indat_callback(struct +@@ -516,7 +516,7 @@ static void option_indat_callback(struct err = usb_submit_urb(urb, GFP_ATOMIC); if (err) printk(KERN_ERR "%s: resubmit read urb failed. " @@ -13858,7 +13858,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } return; -@@ -479,7 +479,7 @@ static void option_outdat_callback(struc +@@ -528,7 +528,7 @@ static void option_outdat_callback(struc struct option_port_private *portdata; int i; @@ -13867,7 +13867,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> port = (struct usb_serial_port *) urb->context; -@@ -503,15 +503,15 @@ static void option_instat_callback(struc +@@ -552,15 +552,15 @@ static void option_instat_callback(struc struct option_port_private *portdata = usb_get_serial_port_data(port); struct usb_serial *serial = port->serial; @@ -13886,7 +13886,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return; } if ((req_pkt->bRequestType == 0xA1) && -@@ -521,7 +521,7 @@ static void option_instat_callback(struc +@@ -570,7 +570,7 @@ static void option_instat_callback(struc urb->transfer_buffer + sizeof(struct usb_ctrlrequest)); @@ -13895,7 +13895,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> old_dcd_state = portdata->dcd_state; portdata->cts_state = 1; -@@ -533,11 +533,11 @@ static void option_instat_callback(struc +@@ -582,11 +582,11 @@ static void option_instat_callback(struc old_dcd_state && !portdata->dcd_state) tty_hangup(port->tty); } else { @@ -13909,7 +13909,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Resubmit urb so we continue receiving IRQ data */ if (status != -ESHUTDOWN) { -@@ -545,7 +545,7 @@ static void option_instat_callback(struc +@@ -594,7 +594,7 @@ static void option_instat_callback(struc err = usb_submit_urb(urb, GFP_ATOMIC); if (err) dbg("%s: resubmit intr urb failed. (%d)", @@ -13918,7 +13918,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } } -@@ -564,7 +564,7 @@ static int option_write_room(struct usb_ +@@ -613,7 +613,7 @@ static int option_write_room(struct usb_ data_len += OUT_BUFLEN; } @@ -13927,7 +13927,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return data_len; } -@@ -582,7 +582,7 @@ static int option_chars_in_buffer(struct +@@ -631,7 +631,7 @@ static int option_chars_in_buffer(struct if (this_urb && test_bit(i, &portdata->out_busy)) data_len += this_urb->transfer_buffer_length; } @@ -13936,7 +13936,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return data_len; } -@@ -595,7 +595,7 @@ static int option_open(struct usb_serial +@@ -644,7 +644,7 @@ static int option_open(struct usb_serial portdata = usb_get_serial_port_data(port); @@ -13945,7 +13945,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Set some sane defaults */ portdata->rts_state = 1; -@@ -607,7 +607,7 @@ static int option_open(struct usb_serial +@@ -656,7 +656,7 @@ static int option_open(struct usb_serial if (! urb) continue; if (urb->dev != serial->dev) { @@ -13954,7 +13954,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> urb->dev, serial->dev); continue; } -@@ -621,7 +621,7 @@ static int option_open(struct usb_serial +@@ -670,7 +670,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", @@ -13963,7 +13963,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> urb->transfer_buffer_length); } } -@@ -649,7 +649,7 @@ static void option_close(struct usb_seri +@@ -698,7 +698,7 @@ static void option_close(struct usb_seri struct usb_serial *serial = port->serial; struct option_port_private *portdata; @@ -13972,7 +13972,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> portdata = usb_get_serial_port_data(port); portdata->rts_state = 0; -@@ -682,7 +682,7 @@ static struct urb *option_setup_urb(stru +@@ -731,7 +731,7 @@ static struct urb *option_setup_urb(stru urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */ if (urb == NULL) { @@ -13981,7 +13981,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return NULL; } -@@ -701,7 +701,7 @@ static void option_setup_urbs(struct usb +@@ -750,7 +750,7 @@ static void option_setup_urbs(struct usb struct usb_serial_port *port; struct option_port_private *portdata; @@ -13990,7 +13990,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> for (i = 0; i < serial->num_ports; i++) { port = serial->port[i]; -@@ -728,7 +728,7 @@ static int option_send_setup(struct usb_ +@@ -777,7 +777,7 @@ static int option_send_setup(struct usb_ struct usb_serial *serial = port->serial; struct option_port_private *portdata; @@ -13999,7 +13999,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (port->number != 0) return 0; -@@ -757,7 +757,7 @@ static int option_startup(struct usb_ser +@@ -806,7 +806,7 @@ static int option_startup(struct usb_ser struct option_port_private *portdata; u8 *buffer; @@ -14008,7 +14008,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* Now setup per port private data */ for (i = 0; i < serial->num_ports; i++) { -@@ -765,7 +765,7 @@ static int option_startup(struct usb_ser +@@ -814,7 +814,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!.", @@ -14017,7 +14017,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return (1); } -@@ -790,7 +790,7 @@ static int option_startup(struct usb_ser +@@ -839,7 +839,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", @@ -14026,7 +14026,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } option_setup_urbs(serial); -@@ -814,7 +814,7 @@ static void option_shutdown(struct usb_s +@@ -863,7 +863,7 @@ static void option_shutdown(struct usb_s struct usb_serial_port *port; struct option_port_private *portdata; 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 b1aff51d7d9b26..0ebb5808f9c8ca 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 -@@ -357,6 +357,7 @@ static int option_tiocmset(struct usb_se +@@ -406,6 +406,7 @@ static int option_tiocmset(struct usb_se portdata = usb_get_serial_port_data(port); |