aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2008-07-03 13:22:57 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-03 13:22:57 -0700
commit75b9a3e3f2d19be04ab4155838a65289b84631af (patch)
treec9f76c57222d2d72af14a1c5fefdf82ab0ed73cd /usb.current
parent3fc881ce962fe5107518a3c167de4f0d1cbfaea2 (diff)
downloadpatches-75b9a3e3f2d19be04ab4155838a65289b84631af.tar.gz
2 usb patches
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-adding-comment-for-ipaq-forcing-number-of-ports.patch33
-rw-r--r--usb.current/usb-fix-oops-on-loading-ipaq-module-since-2.6.26.patch30
2 files changed, 63 insertions, 0 deletions
diff --git a/usb.current/usb-adding-comment-for-ipaq-forcing-number-of-ports.patch b/usb.current/usb-adding-comment-for-ipaq-forcing-number-of-ports.patch
new file mode 100644
index 00000000000000..993ce4e867762c
--- /dev/null
+++ b/usb.current/usb-adding-comment-for-ipaq-forcing-number-of-ports.patch
@@ -0,0 +1,33 @@
+From oliver@neukum.org Thu Jul 3 13:09:29 2008
+From: Oliver Neukum <oliver@neukum.org>
+Date: Thu, 3 Jul 2008 17:14:16 +0200
+Subject: USB: adding comment for ipaq forcing number of ports
+To: Adrian Bunk <bunk@kernel.org>
+Cc: Greg KH <greg@kroah.com>, linux-usb@vger.kernel.org
+Message-ID: <200807031714.16617.oliver@neukum.org>
+Content-Disposition: inline
+
+
+The reason for forcing a number of ports should be documented.
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ipaq.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/usb/serial/ipaq.c
++++ b/drivers/usb/serial/ipaq.c
+@@ -570,6 +570,11 @@ static struct usb_serial_driver ipaq_dev
+ .description = "PocketPC PDA",
+ .usb_driver = &ipaq_driver,
+ .id_table = ipaq_id_table,
++ /*
++ * some devices have an extra endpoint, which
++ * must be ignored as it would make the core
++ * create a second port which oopses when used
++ */
+ .num_ports = 1,
+ .open = ipaq_open,
+ .close = ipaq_close,
diff --git a/usb.current/usb-fix-oops-on-loading-ipaq-module-since-2.6.26.patch b/usb.current/usb-fix-oops-on-loading-ipaq-module-since-2.6.26.patch
new file mode 100644
index 00000000000000..d365689a683aaf
--- /dev/null
+++ b/usb.current/usb-fix-oops-on-loading-ipaq-module-since-2.6.26.patch
@@ -0,0 +1,30 @@
+From oliver@neukum.org Thu Jul 3 13:08:17 2008
+From: Oliver Neukum <oliver@neukum.org>
+Date: Thu, 3 Jul 2008 10:05:57 +0200
+Subject: USB: fix Oops on loading ipaq module since 2.6.26
+To: Adam Williamson <awilliamson@mandriva.com>
+Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>, Adrian Bunk <bunk@kernel.org>, Arjan van de Ven <arjan@infradead.org>, "Rafael J. Wysocki" <rjw@sisk.pl>, Alan Cox <alan@redhat.com>, bugme-daemon@bugzilla.kernel.org, Greg KH <greg@kroah.com>, linux-usb@vger.kernel.org
+Message-ID: <200807031005.59691.oliver@neukum.org>
+Content-Disposition: inline
+
+Fixes bugzilla.kernel.org #10868
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/serial/ipaq.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/serial/ipaq.c
++++ b/drivers/usb/serial/ipaq.c
+@@ -570,7 +570,7 @@ static struct usb_serial_driver ipaq_dev
+ .description = "PocketPC PDA",
+ .usb_driver = &ipaq_driver,
+ .id_table = ipaq_id_table,
+- .num_ports = 2,
++ .num_ports = 1,
+ .open = ipaq_open,
+ .close = ipaq_close,
+ .attach = ipaq_startup,