diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-31 10:40:54 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-31 10:40:54 -0800 |
commit | 96c562c46f53108b16602dc0e469e21e3ed667a9 (patch) | |
tree | 05d01c155915328035fe077ead1acfbea73b5d97 | |
parent | 911c88314ae7f1695f342e824cf86846b9be9ca7 (diff) | |
download | longterm-queue-2.6.32-96c562c46f53108b16602dc0e469e21e3ed667a9.tar.gz |
2.6.32-stable patches
added patches:
usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch
usb-usbsevseg-fix-max-length.patch
-rw-r--r-- | queue-2.6.32/series | 2 | ||||
-rw-r--r-- | queue-2.6.32/usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch | 57 | ||||
-rw-r--r-- | queue-2.6.32/usb-usbsevseg-fix-max-length.patch | 32 |
3 files changed, 91 insertions, 0 deletions
diff --git a/queue-2.6.32/series b/queue-2.6.32/series index d732a5a..d24a498 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -12,3 +12,5 @@ usb-ftdi_sio-add-pid-for-ti-xds100v2-beaglebone-a3.patch usb-serial-ftdi-additional-ids.patch usb-ftdi_sio-add-more-identifiers.patch usb-cdc-wdm-updating-desc-length-must-be-protected-by-spin_lock.patch +usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch +usb-usbsevseg-fix-max-length.patch diff --git a/queue-2.6.32/usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch b/queue-2.6.32/usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch new file mode 100644 index 0000000..5e0b9a7 --- /dev/null +++ b/queue-2.6.32/usb-io_ti-make-edge_remove_sysfs_attrs-the-port_remove-method.patch @@ -0,0 +1,57 @@ +From 6d443d8499e4e59ffb949759cdded32730f8d2f6 Mon Sep 17 00:00:00 2001 +From: "Eric W. Biederman" <ebiederm@xmission.com> +Date: Fri, 13 Jan 2012 21:32:06 -0800 +Subject: usb: io_ti: Make edge_remove_sysfs_attrs the port_remove method. + +From: "Eric W. Biederman" <ebiederm@xmission.com> + +commit 6d443d8499e4e59ffb949759cdded32730f8d2f6 upstream. + +Calling edge_remove_sysfs_attrs from edge_disconnect is too late +as the device has already been removed from sysfs. + +Do the simple and obvious thing and make edge_remove_sysfs_attrs +the port_remove method. + +Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> +Reported-by: Wolfgang Frisch <wfpub@roembden.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/io_ti.c | 10 ++-------- + 1 file changed, 2 insertions(+), 8 deletions(-) + +--- a/drivers/usb/serial/io_ti.c ++++ b/drivers/usb/serial/io_ti.c +@@ -2664,15 +2664,7 @@ cleanup: + + static void edge_disconnect(struct usb_serial *serial) + { +- int i; +- struct edgeport_port *edge_port; +- + dbg("%s", __func__); +- +- for (i = 0; i < serial->num_ports; ++i) { +- edge_port = usb_get_serial_port_data(serial->port[i]); +- edge_remove_sysfs_attrs(edge_port->port); +- } + } + + static void edge_release(struct usb_serial *serial) +@@ -2927,6 +2919,7 @@ static struct usb_serial_driver edgeport + .disconnect = edge_disconnect, + .release = edge_release, + .port_probe = edge_create_sysfs_attrs, ++ .port_remove = edge_remove_sysfs_attrs, + .ioctl = edge_ioctl, + .set_termios = edge_set_termios, + .tiocmget = edge_tiocmget, +@@ -2957,6 +2950,7 @@ static struct usb_serial_driver edgeport + .disconnect = edge_disconnect, + .release = edge_release, + .port_probe = edge_create_sysfs_attrs, ++ .port_remove = edge_remove_sysfs_attrs, + .ioctl = edge_ioctl, + .set_termios = edge_set_termios, + .tiocmget = edge_tiocmget, diff --git a/queue-2.6.32/usb-usbsevseg-fix-max-length.patch b/queue-2.6.32/usb-usbsevseg-fix-max-length.patch new file mode 100644 index 0000000..096bbd4 --- /dev/null +++ b/queue-2.6.32/usb-usbsevseg-fix-max-length.patch @@ -0,0 +1,32 @@ +From 1097ccebe630170080c41df0edcf88e0626e9c75 Mon Sep 17 00:00:00 2001 +From: Harrison Metzger <harrisonmetz@gmail.com> +Date: Sun, 15 Jan 2012 08:43:24 -0600 +Subject: USB: usbsevseg: fix max length + +From: Harrison Metzger <harrisonmetz@gmail.com> + +commit 1097ccebe630170080c41df0edcf88e0626e9c75 upstream. + +This changes the max length for the usb seven segment delcom device to 8 +from 6. Delcom has both 6 and 8 variants and having 8 works fine with +devices which are only 6. + +Signed-off-by: Harrison Metzger <harrisonmetz@gmail.com> +Signed-off-by: Stuart Pook <stuart@acm.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/misc/usbsevseg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/misc/usbsevseg.c ++++ b/drivers/usb/misc/usbsevseg.c +@@ -24,7 +24,7 @@ + + #define VENDOR_ID 0x0fc5 + #define PRODUCT_ID 0x1227 +-#define MAXLEN 6 ++#define MAXLEN 8 + + /* table of devices that work with this driver */ + static struct usb_device_id id_table[] = { |