more usb patches

5 files changed, 192 insertions, 0 deletions

diff --git a/usb/one-potential-problem-in-gadget-serial.c.patch b/usb/one-potential-problem-in-gadget-serial.c.patch
new file mode 100644
index 0000000000000..0737d1db062c1
--- /dev/null
+++ b/usb/one-potential-problem-in-gadget-serial.c.patch
@@ -0,0 +1,31 @@
+From linux-usb-devel-admin@lists.sourceforge.net Thu Nov 17 18:24:41 2005
+Message-ID: <f3977ab60511171835o550d86a6p161651ac29108fd6@mail.gmail.com>
+From: Fengwei Yin <xaityyy@gmail.com>
+Subject: [linux-usb-devel] One potential problem in gadget/serial.c
+Date: Fri, 18 Nov 2005 10:35:36 +0800
+
+It looks like that the gs_serial module maybe sleep with spinlock in gs_close.
+Sometimes, system hang when I remove the gs_serial module.
+
+From: Fengwei Yin <xaityyy@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/serial.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/gadget/serial.c
++++ gregkh-2.6/drivers/usb/gadget/serial.c
+@@ -889,10 +889,12 @@ static void gs_close(struct tty_struct *
+ 	/* wait for write buffer to drain, or */
+ 	/* at most GS_CLOSE_TIMEOUT seconds */
+ 	if (gs_buf_data_avail(port->port_write_buf) > 0) {
++		spin_unlock_irqrestore(&port->port_lock, flags);
+ 		wait_cond_interruptible_timeout(port->port_write_wait,
+ 		port->port_dev == NULL
+ 		|| gs_buf_data_avail(port->port_write_buf) == 0,
+ 		&port->port_lock, flags, GS_CLOSE_TIMEOUT * HZ);
++		spin_lock_irqsave(&port->port_lock, flags);
+ 	}
+ 
+ 	/* free disconnected port on final close */
diff --git a/usb/usb-fix-usb-key-generates-ioctl_internal_command-errors-issue.patch b/usb/usb-fix-usb-key-generates-ioctl_internal_command-errors-issue.patch
new file mode 100644
index 0000000000000..90eb9f74d8d7d
--- /dev/null
+++ b/usb/usb-fix-usb-key-generates-ioctl_internal_command-errors-issue.patch
@@ -0,0 +1,55 @@
+From linux-usb-devel-admin@lists.sourceforge.net Thu Nov 17 13:17:12 2005
+From: David =?iso-8859-1?Q?H=E4rdeman?= <david@2gen.com>
+To: Pete Zaitcev <zaitcev@redhat.com>
+Message-ID: <20051117212842.GA8110@hardeman.nu>
+Content-Disposition: inline
+Subject: USB: fix USB key generates ioctl_internal_command errors issue
+Date: Thu, 17 Nov 2005 22:28:42 +0100
+
+On Wed, Nov 16, 2005 at 06:34:24PM -0800, Pete Zaitcev wrote:
+>On Wed, 16 Nov 2005 23:52:32 +0100, David Härdeman <david@2gen.com> wrote:
+>> usb-storage: waiting for device to settle before scanning
+>>   Vendor: I0MEGA    Model: UMni1GB*IOM2K4    Rev: 1.01
+>>   Type:   Direct-Access                      ANSI SCSI revision: 02
+>> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB)
+>> sda: Write Protect is off
+>> sda: Mode Sense: 00 00 00 00
+>> sda: assuming drive cache: write through
+>> ioctl_internal_command: <8 0 0 0> return code = 8000002
+>>    : Current: sense key=0x0
+>>     ASC=0x0 ASCQ=0x0
+>> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB)
+>
+>I think it's harmless. I saw things like that, and initially I plugged
+>them with workarounds like this:
+
+Thanks for the pointer, and yes, it is harmless, but it floods the
+console with the messages which hides other (potentially important)
+messages...following your example I've made a patch which fixes the
+problem.
+
+Signed-off-by: David Härdeman <david@2gen.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- gregkh-2.6.orig/drivers/usb/storage/unusual_devs.h
++++ gregkh-2.6/drivers/usb/storage/unusual_devs.h
+@@ -1118,6 +1118,15 @@ UNUSUAL_DEV(  0x2735, 0x100b, 0x0000, 0x
+ 		US_SC_DEVICE, US_PR_DEVICE, NULL,
+ 		US_FL_GO_SLOW ),
+ 
++/*
++ * David Härdeman <david@2gen.com>
++ * The key makes the SCSI stack print confusing (but harmless) messages
++ */
++UNUSUAL_DEV(  0x4146, 0xba01, 0x0100, 0x0100,
++		"Iomega",
++		"Micro Mini 1GB",
++		US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ),
++
+ #ifdef CONFIG_USB_STORAGE_SDDR55
+ UNUSUAL_DEV(  0x55aa, 0xa103, 0x0000, 0x9999, 
+ 		"Sandisk",
diff --git a/usb/usb-kernel-doc-for-linux-usb.h.patch b/usb/usb-kernel-doc-for-linux-usb.h.patch
new file mode 100644
index 0000000000000..cbb4d77aba4f0
--- /dev/null
+++ b/usb/usb-kernel-doc-for-linux-usb.h.patch
@@ -0,0 +1,27 @@
+From rdunlap@xenotime.net Fri Nov 18 22:57:58 2005
+Date: Fri, 18 Nov 2005 23:06:09 -0800
+From: "Randy.Dunlap" <rdunlap@xenotime.net>
+Cc: gregkh <greg@kroah.com>
+Subject: USB: kernel-doc for linux/usb.h
+Message-Id: <20051118230609.5a75630d.rdunlap@xenotime.net>
+
+From: Randy Dunlap <rdunlap@xenotime.net>
+
+Fix kernel-doc warning in linux/usb.h.
+
+Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+---
+ include/linux/usb.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- gregkh-2.6.orig/include/linux/usb.h
++++ gregkh-2.6/include/linux/usb.h
+@@ -47,6 +47,7 @@ struct usb_driver;
+  * @urb_list: urbs queued to this endpoint; maintained by usbcore
+  * @hcpriv: for use by HCD; typically holds hardware dma queue head (QH)
+  *	with one or more transfer descriptors (TDs) per urb
++ * @kobj: kobject for sysfs info
+  * @extra: descriptors following this endpoint in the configuration
+  * @extralen: how many bytes of "extra" are valid
+  *
diff --git a/usb/usb-serial-remove-redundant-include.patch b/usb/usb-serial-remove-redundant-include.patch
new file mode 100644
index 0000000000000..843430b0c0a6e
--- /dev/null
+++ b/usb/usb-serial-remove-redundant-include.patch
@@ -0,0 +1,26 @@
+From nikai@nikai.net Sat Nov 19 04:51:33 2005
+Date: Sat, 19 Nov 2005 14:05:16 +0100
+From: Nicolas Kaiser <nikai@nikai.net>
+To: Greg Kroah-Hartman <greg@kroah.com>
+Subject: usb serial: remove redundant include
+Message-ID: <20051119140516.1f37a5be@lucky.kitzblitz>
+
+remove redundant include
+
+Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ipw.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- gregkh-2.6.orig/drivers/usb/serial/ipw.c
++++ gregkh-2.6/drivers/usb/serial/ipw.c
+@@ -46,7 +46,6 @@
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+ #include <linux/usb.h>
+-#include <linux/usb.h>
+ #include <asm/uaccess.h>
+ #include "usb-serial.h"
+ 
diff --git a/usb/usb-small-cleanups.patch b/usb/usb-small-cleanups.patch
new file mode 100644
index 0000000000000..153dbc4072794
--- /dev/null
+++ b/usb/usb-small-cleanups.patch
@@ -0,0 +1,53 @@
+From bunk@stusta.de Mon Nov 21 13:09:07 2005
+Date: Sun, 20 Nov 2005 23:56:11 +0100
+From: Adrian Bunk <bunk@stusta.de>
+To: <gregkh@suse.de>
+Cc: <mdharm-usb@one-eyed-alien.net>
+Subject: USB: small cleanups
+Message-ID: <20051120225611.GA16060@stusta.de>
+Content-Disposition: inline
+
+This patch contains the following cleanups:
+- make needlessly global functions static
+- every file should #include the headers containing the prototypes for
+  it's global functions
+
+
+Signed-off-by: Adrian Bunk <bunk@stusta.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/atm/usbatm.c   |    4 ++--
+ drivers/usb/serial/io_ti.c |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- gregkh-2.6.orig/drivers/usb/atm/usbatm.c
++++ gregkh-2.6/drivers/usb/atm/usbatm.c
+@@ -646,14 +646,14 @@ static void usbatm_destroy_instance(stru
+ 	kfree(instance);
+ }
+ 
+-void usbatm_get_instance(struct usbatm_data *instance)
++static void usbatm_get_instance(struct usbatm_data *instance)
+ {
+ 	dbg("%s", __func__);
+ 
+ 	kref_get(&instance->refcount);
+ }
+ 
+-void usbatm_put_instance(struct usbatm_data *instance)
++static void usbatm_put_instance(struct usbatm_data *instance)
+ {
+ 	dbg("%s", __func__);
+ 
+--- gregkh-2.6.orig/drivers/usb/serial/io_ti.c
++++ gregkh-2.6/drivers/usb/serial/io_ti.c
+@@ -2843,7 +2843,7 @@ static struct edge_buf *edge_buf_alloc(u
+  * Free the buffer and all associated memory.
+  */
+ 
+-void edge_buf_free(struct edge_buf *eb)
++static void edge_buf_free(struct edge_buf *eb)
+ {
+ 	if (eb) {
+ 		kfree(eb->buf_buf);