From 191856d295b60f30ebdbc907d647d5c78953d09c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 26 Mar 2013 13:19:58 -0700 Subject: [PATCH] 3.8-stable patches added patches: usb-garmin_gps-fix-memory-leak-on-disconnect.patch usb-io_ti-fix-get_icount-for-two-port-adapters.patch usb-musb-da8xx-fix-build-breakage-due-to-typo.patch --- queue-3.8/series | 3 ++ ...in_gps-fix-memory-leak-on-disconnect.patch | 45 +++++++++++++++++++ ...fix-get_icount-for-two-port-adapters.patch | 32 +++++++++++++ ...da8xx-fix-build-breakage-due-to-typo.patch | 37 +++++++++++++++ 4 files changed, 117 insertions(+) create mode 100644 queue-3.8/usb-garmin_gps-fix-memory-leak-on-disconnect.patch create mode 100644 queue-3.8/usb-io_ti-fix-get_icount-for-two-port-adapters.patch create mode 100644 queue-3.8/usb-musb-da8xx-fix-build-breakage-due-to-typo.patch diff --git a/queue-3.8/series b/queue-3.8/series index 85ba1bf21d7..9a8129107cf 100644 --- a/queue-3.8/series +++ b/queue-3.8/series @@ -91,3 +91,6 @@ efivars-add-module-parameter-to-disable-use-as-a-pstore-backend.patch efivars-fix-check-for-config_efi_vars_pstore_default_disable.patch acpi-rework-acpi_get_child-to-be-more-efficient.patch udf-fix-bitmap-overflow-on-large-filesystems-with-small-block-size.patch +usb-garmin_gps-fix-memory-leak-on-disconnect.patch +usb-io_ti-fix-get_icount-for-two-port-adapters.patch +usb-musb-da8xx-fix-build-breakage-due-to-typo.patch diff --git a/queue-3.8/usb-garmin_gps-fix-memory-leak-on-disconnect.patch b/queue-3.8/usb-garmin_gps-fix-memory-leak-on-disconnect.patch new file mode 100644 index 00000000000..11c536c7f73 --- /dev/null +++ b/queue-3.8/usb-garmin_gps-fix-memory-leak-on-disconnect.patch @@ -0,0 +1,45 @@ +From 618aa1068df29c37a58045fe940f9106664153fd Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 19 Mar 2013 09:21:07 +0100 +Subject: USB: garmin_gps: fix memory leak on disconnect + +From: Johan Hovold + +commit 618aa1068df29c37a58045fe940f9106664153fd upstream. + +Remove bogus disconnect test introduced by 95bef012e ("USB: more serial +drivers writing after disconnect") which prevented queued data from +being freed on disconnect. + +The possible IO it was supposed to prevent is long gone. + +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/garmin_gps.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +--- a/drivers/usb/serial/garmin_gps.c ++++ b/drivers/usb/serial/garmin_gps.c +@@ -959,10 +959,7 @@ static void garmin_close(struct usb_seri + if (!serial) + return; + +- mutex_lock(&port->serial->disc_mutex); +- +- if (!port->serial->disconnected) +- garmin_clear(garmin_data_p); ++ garmin_clear(garmin_data_p); + + /* shutdown our urbs */ + usb_kill_urb(port->read_urb); +@@ -971,8 +968,6 @@ static void garmin_close(struct usb_seri + /* keep reset state so we know that we must start a new session */ + if (garmin_data_p->state != STATE_RESET) + garmin_data_p->state = STATE_DISCONNECTED; +- +- mutex_unlock(&port->serial->disc_mutex); + } + + diff --git a/queue-3.8/usb-io_ti-fix-get_icount-for-two-port-adapters.patch b/queue-3.8/usb-io_ti-fix-get_icount-for-two-port-adapters.patch new file mode 100644 index 00000000000..4848b7d0451 --- /dev/null +++ b/queue-3.8/usb-io_ti-fix-get_icount-for-two-port-adapters.patch @@ -0,0 +1,32 @@ +From 5492bf3d5655b4954164f69c02955a7fca267611 Mon Sep 17 00:00:00 2001 +From: Johan Hovold +Date: Tue, 19 Mar 2013 09:21:08 +0100 +Subject: USB: io_ti: fix get_icount for two port adapters + +From: Johan Hovold + +commit 5492bf3d5655b4954164f69c02955a7fca267611 upstream. + +Add missing get_icount field to two-port driver. + +The two-port driver was not updated when switching to the new icount +interface in commit 0bca1b913aff ("tty: Convert the USB drivers to the +new icount interface"). + +Signed-off-by: Johan Hovold +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/io_ti.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/io_ti.c ++++ b/drivers/usb/serial/io_ti.c +@@ -2702,6 +2702,7 @@ static struct usb_serial_driver edgeport + .set_termios = edge_set_termios, + .tiocmget = edge_tiocmget, + .tiocmset = edge_tiocmset, ++ .get_icount = edge_get_icount, + .write = edge_write, + .write_room = edge_write_room, + .chars_in_buffer = edge_chars_in_buffer, diff --git a/queue-3.8/usb-musb-da8xx-fix-build-breakage-due-to-typo.patch b/queue-3.8/usb-musb-da8xx-fix-build-breakage-due-to-typo.patch new file mode 100644 index 00000000000..261c90df82a --- /dev/null +++ b/queue-3.8/usb-musb-da8xx-fix-build-breakage-due-to-typo.patch @@ -0,0 +1,37 @@ +From db9e51617faad3a54d10b7cb340a82688ec0232d Mon Sep 17 00:00:00 2001 +From: Mikhail Kshevetskiy +Date: Thu, 14 Mar 2013 10:18:29 +0100 +Subject: usb: musb: da8xx: Fix build breakage due to typo + +From: Mikhail Kshevetskiy + +commit db9e51617faad3a54d10b7cb340a82688ec0232d upstream. + +Commit 032ec49f5351e9cb242b1a1c367d14415043ab95 (usb: musb: drop useless +board_mode usage) introduced a typo that breaks the build. + +Signed-off-by: Mikhail Kshevetskiy + +[ Fixed commit message ] + +Signed-off-by: Michael Riesch +Cc: Mikhail Kshevetskiy +Cc: Sergei Shtylyov +Signed-off-by: Felipe Balbi +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/musb/da8xx.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/musb/da8xx.c ++++ b/drivers/usb/musb/da8xx.c +@@ -327,7 +327,7 @@ static irqreturn_t da8xx_musb_interrupt( + u8 devctl = musb_readb(mregs, MUSB_DEVCTL); + int err; + +- err = musb->int_usb & USB_INTR_VBUSERROR; ++ err = musb->int_usb & MUSB_INTR_VBUSERROR; + if (err) { + /* + * The Mentor core doesn't debounce VBUS as needed -- 2.47.3