]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
3.8-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 20:19:58 +0000 (13:19 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 26 Mar 2013 20:19:58 +0000 (13:19 -0700)
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
queue-3.8/usb-garmin_gps-fix-memory-leak-on-disconnect.patch [new file with mode: 0644]
queue-3.8/usb-io_ti-fix-get_icount-for-two-port-adapters.patch [new file with mode: 0644]
queue-3.8/usb-musb-da8xx-fix-build-breakage-due-to-typo.patch [new file with mode: 0644]

index 85ba1bf21d7056ef233b43e3fdede337594779be..9a8129107cf163a7a6c3cac64bf3c1e757c57d04 100644 (file)
@@ -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 (file)
index 0000000..11c536c
--- /dev/null
@@ -0,0 +1,45 @@
+From 618aa1068df29c37a58045fe940f9106664153fd Mon Sep 17 00:00:00 2001
+From: Johan Hovold <jhovold@gmail.com>
+Date: Tue, 19 Mar 2013 09:21:07 +0100
+Subject: USB: garmin_gps: fix memory leak on disconnect
+
+From: Johan Hovold <jhovold@gmail.com>
+
+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 <jhovold@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 (file)
index 0000000..4848b7d
--- /dev/null
@@ -0,0 +1,32 @@
+From 5492bf3d5655b4954164f69c02955a7fca267611 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <jhovold@gmail.com>
+Date: Tue, 19 Mar 2013 09:21:08 +0100
+Subject: USB: io_ti: fix get_icount for two port adapters
+
+From: Johan Hovold <jhovold@gmail.com>
+
+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 <jhovold@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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 (file)
index 0000000..261c90d
--- /dev/null
@@ -0,0 +1,37 @@
+From db9e51617faad3a54d10b7cb340a82688ec0232d Mon Sep 17 00:00:00 2001
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
+Date: Thu, 14 Mar 2013 10:18:29 +0100
+Subject: usb: musb: da8xx: Fix build breakage due to typo
+
+From: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
+
+commit db9e51617faad3a54d10b7cb340a82688ec0232d upstream.
+
+Commit 032ec49f5351e9cb242b1a1c367d14415043ab95 (usb: musb: drop useless
+board_mode usage) introduced a typo that breaks the build.
+
+Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
+
+[ Fixed commit message ]
+
+Signed-off-by: Michael Riesch <michael.riesch@omicron.at>
+Cc: Mikhail Kshevetskiy <mikhail.kshevetskiy@gmail.com>
+Cc: Sergei Shtylyov <sshtylyov@mvista.com>
+Signed-off-by: Felipe Balbi <balbi@ti.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ 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