aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-12-22 12:22:11 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-22 12:22:11 -0800
commit52a248c714fb17267c89520a4a854b0f65de998c (patch)
treeb08803dad70c8bfeba8a20e4c06b24ea6ce5cf9d /usb.current
parentae75e9fa49d0b2a2a776794dad9e420e7bc269f2 (diff)
downloadpatches-52a248c714fb17267c89520a4a854b0f65de998c.tar.gz
huge catchup on pending patches
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-add-device-id-for-apple-cinema-display-23in-2007.patch90
-rw-r--r--usb.current/usb-core-fix-recent-kernel-doc-warnings.patch53
-rw-r--r--usb.current/usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch46
-rw-r--r--usb.current/usb-fix-section-mismatch-in-early-ehci-dbgp.patch34
-rw-r--r--usb.current/usb-serial-extra-device-vendor-id-for-mos7840-driver.patch46
5 files changed, 269 insertions, 0 deletions
diff --git a/usb.current/usb-add-device-id-for-apple-cinema-display-23in-2007.patch b/usb.current/usb-add-device-id-for-apple-cinema-display-23in-2007.patch
new file mode 100644
index 00000000000000..05874340619204
--- /dev/null
+++ b/usb.current/usb-add-device-id-for-apple-cinema-display-23in-2007.patch
@@ -0,0 +1,90 @@
+From pancho@pancho.name Tue Dec 22 11:28:58 2009
+From: pancho horrillo <pancho@pancho.name>
+Date: Wed, 2 Dec 2009 20:19:42 +0100
+Subject: USB: add device ID for Apple Cinema Display 23in 2007
+To: Greg Kroah-Hartman <gregkh@suse.de>
+Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
+Message-ID: <20091202191942.GA7362@pancho.name>
+Content-Disposition: inline
+
+
+Hi!
+
+$ lsusb -v
+Bus 001 Device 008: ID 05ac:921c Apple, Inc.
+Device Descriptor:
+ bLength 18
+ bDescriptorType 1
+ bcdUSB 1.10
+ bDeviceClass 0 (Defined at Interface level)
+ bDeviceSubClass 0
+ bDeviceProtocol 0
+ bMaxPacketSize0 8
+ idVendor 0x05ac Apple, Inc.
+ idProduct 0x921c
+ bcdDevice 1.15
+ iManufacturer 1
+ iProduct 2
+ iSerial 0
+ bNumConfigurations 1
+ Configuration Descriptor:
+ bLength 9
+ bDescriptorType 2
+ wTotalLength 34
+ bNumInterfaces 1
+ bConfigurationValue 1
+ iConfiguration 0
+ bmAttributes 0xe0
+ Self Powered
+ Remote Wakeup
+ MaxPower 2mA
+ Interface Descriptor:
+ bLength 9
+ bDescriptorType 4
+ bInterfaceNumber 0
+ bAlternateSetting 0
+ bNumEndpoints 1
+ bInterfaceClass 3 Human Interface Device
+ bInterfaceSubClass 0 No Subclass
+ bInterfaceProtocol 0 None
+ iInterface 0
+ HID Device Descriptor:
+ bLength 9
+ bDescriptorType 33
+ bcdHID 1.11
+ bCountryCode 0 Not supported
+ bNumDescriptors 1
+ bDescriptorType 34 Report
+ wDescriptorLength 92
+ Report Descriptors:
+ ** UNAVAILABLE **
+ Endpoint Descriptor:
+ bLength 7
+ bDescriptorType 5
+ bEndpointAddress 0x81 EP 1 IN
+ bmAttributes 3
+ Transfer Type Interrupt
+ Synch Type None
+ Usage Type Data
+ wMaxPacketSize 0x0008 1x 8 bytes
+ bInterval 16
+
+
+
+Signed-off-by: pancho horrillo <pancho@pancho.name>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/misc/appledisplay.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/usb/misc/appledisplay.c
++++ b/drivers/usb/misc/appledisplay.c
+@@ -60,6 +60,7 @@
+ static struct usb_device_id appledisplay_table [] = {
+ { APPLEDISPLAY_DEVICE(0x9218) },
+ { APPLEDISPLAY_DEVICE(0x9219) },
++ { APPLEDISPLAY_DEVICE(0x921c) },
+ { APPLEDISPLAY_DEVICE(0x921d) },
+
+ /* Terminating entry */
diff --git a/usb.current/usb-core-fix-recent-kernel-doc-warnings.patch b/usb.current/usb-core-fix-recent-kernel-doc-warnings.patch
new file mode 100644
index 00000000000000..9c6a8ffe3c7478
--- /dev/null
+++ b/usb.current/usb-core-fix-recent-kernel-doc-warnings.patch
@@ -0,0 +1,53 @@
+From randy.dunlap@oracle.com Tue Dec 22 11:49:15 2009
+From: Randy Dunlap <randy.dunlap@oracle.com>
+Date: Sun, 13 Dec 2009 10:17:16 -0800
+Subject: USB core: fix recent kernel-doc warnings
+Cc: gregkh@kroah.com
+Message-ID: <20091213101716.cc314005.randy.dunlap@oracle.com>
+
+
+From: Randy Dunlap <randy.dunlap@oracle.com>
+
+Fix new kernel-doc warnings in usb core:
+
+Warning(drivers/usb/core/usb.c:79): No description found for parameter 'config'
+Warning(drivers/usb/core/usb.c:79): No description found for parameter 'iface_num'
+Warning(drivers/usb/core/usb.c:79): No description found for parameter 'alt_num'
+Warning(drivers/usb/core/hcd.c:1622): No description found for parameter 'udev'
+
+Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/core/hcd.c | 4 +++-
+ drivers/usb/core/usb.c | 6 +++---
+ 2 files changed, 6 insertions(+), 4 deletions(-)
+
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1597,7 +1597,9 @@ rescan:
+ }
+
+ /**
+- * Check whether a new bandwidth setting exceeds the bus bandwidth.
++ * usb_hcd_alloc_bandwidth - check whether a new bandwidth setting exceeds
++ * the bus bandwidth
++ * @udev: target &usb_device
+ * @new_config: new configuration to install
+ * @cur_alt: the current alternate interface setting
+ * @new_alt: alternate interface setting that is being installed
+--- a/drivers/usb/core/usb.c
++++ b/drivers/usb/core/usb.c
+@@ -66,9 +66,9 @@ MODULE_PARM_DESC(autosuspend, "default a
+ /**
+ * usb_find_alt_setting() - Given a configuration, find the alternate setting
+ * for the given interface.
+- * @config - the configuration to search (not necessarily the current config).
+- * @iface_num - interface number to search in
+- * @alt_num - alternate interface setting number to search for.
++ * @config: the configuration to search (not necessarily the current config).
++ * @iface_num: interface number to search in
++ * @alt_num: alternate interface setting number to search for.
+ *
+ * Search the configuration's interface cache for the given alt setting.
+ */
diff --git a/usb.current/usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch b/usb.current/usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch
new file mode 100644
index 00000000000000..62c75ac0038943
--- /dev/null
+++ b/usb.current/usb-emi62-fix-crash-when-trying-to-load-emi-6-2-firmware.patch
@@ -0,0 +1,46 @@
+From akpm@linux-foundation.org Tue Dec 22 11:19:53 2009
+From: Clemens Ladisch <clemens@ladisch.de>
+Date: Mon, 21 Dec 2009 15:36:44 -0800
+Subject: USB: emi62: fix crash when trying to load EMI 6|2 firmware
+To: greg@kroah.com
+Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, clemens@ladisch.de, David.Woodhouse@intel.com, retroeffective@gmail.com, stable@kernel.org
+Message-ID: <200912212336.nBLNai5Z002837@imap1.linux-foundation.org>
+
+
+From: Clemens Ladisch <clemens@ladisch.de>
+
+While converting emi62 to use request_firmware(), the driver was also
+changed to use the ihex helper functions. However, this broke the loading
+of the FPGA firmware because the code tries to access the addr field of
+the EOF record which works with a plain array that has an empty last
+record but not with the ihex helper functions where the end of the data is
+signaled with a NULL record pointer, resulting in:
+
+BUG: unable to handle kernel NULL pointer dereference at (null)
+IP: [<f80d248c>] emi62_load_firmware+0x33c/0x740 [emi62]
+
+This can be fixed by changing the loop condition to test the return value
+of ihex_next_binrec() directly (like in emi26.c).
+
+Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
+Reported-and-tested-by: Der Mickster <retroeffective@gmail.com>
+Acked-by: David Woodhouse <David.Woodhouse@intel.com>
+Cc: stable <stable@kernel.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/misc/emi62.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/misc/emi62.c
++++ b/drivers/usb/misc/emi62.c
+@@ -167,7 +167,7 @@ static int emi62_load_firmware (struct u
+ err("%s - error loading firmware: error = %d", __func__, err);
+ goto wraperr;
+ }
+- } while (i > 0);
++ } while (rec);
+
+ /* Assert reset (stop the CPU in the EMI) */
+ err = emi62_set_reset(dev,1);
diff --git a/usb.current/usb-fix-section-mismatch-in-early-ehci-dbgp.patch b/usb.current/usb-fix-section-mismatch-in-early-ehci-dbgp.patch
new file mode 100644
index 00000000000000..086270b0f54fcb
--- /dev/null
+++ b/usb.current/usb-fix-section-mismatch-in-early-ehci-dbgp.patch
@@ -0,0 +1,34 @@
+From JBeulich@novell.com Tue Dec 22 11:20:33 2009
+From: "Jan Beulich" <JBeulich@novell.com>
+Date: Fri, 20 Nov 2009 13:50:53 +0000
+Subject: USB: fix section mismatch in early ehci dbgp
+To: <gregkh@suse.de>
+Cc: <linux-kernel@vger.kernel.org>, <jason.wessel@windriver.com>
+Message-ID: <4B06ACCD02000078000211E0@vpn.id2.novell.com>
+Content-Disposition: inline
+
+
+Commit 917778267fbe67703ab7d5c6f0b7a05d4c3df485 removed __init from
+ehci_wait_for_port(), but left it in place on ehci_reset_port(), which
+is being called from the former function.
+
+Signed-off-by: Jan Beulich <jbeulich@novell.com>
+Acked-by: Jason Wessel <jason.wessel@windriver.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/early/ehci-dbgp.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/early/ehci-dbgp.c
++++ b/drivers/usb/early/ehci-dbgp.c
+@@ -613,7 +613,7 @@ err:
+ }
+ EXPORT_SYMBOL_GPL(dbgp_external_startup);
+
+-static int __init ehci_reset_port(int port)
++static int ehci_reset_port(int port)
+ {
+ u32 portsc;
+ u32 delay_time, delay;
diff --git a/usb.current/usb-serial-extra-device-vendor-id-for-mos7840-driver.patch b/usb.current/usb-serial-extra-device-vendor-id-for-mos7840-driver.patch
new file mode 100644
index 00000000000000..067b5e77adec99
--- /dev/null
+++ b/usb.current/usb-serial-extra-device-vendor-id-for-mos7840-driver.patch
@@ -0,0 +1,46 @@
+From blaise@willowgarage.com Tue Dec 22 11:01:05 2009
+From: Blaise Gassend <blaise@willowgarage.com>
+Date: Fri, 18 Dec 2009 15:23:38 -0800
+Subject: USB: serial: Extra device/vendor ID for mos7840 driver
+To: Greg KH <greg@kroah.com>
+Message-ID: <1261178618.31881.200.camel@lts.willowgarage.com>
+
+
+Signed-off-by: Blaise Gassend <blaise.gasend_linux@m4x.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+
+---
+ drivers/usb/serial/mos7840.c | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/serial/mos7840.c
++++ b/drivers/usb/serial/mos7840.c
+@@ -127,8 +127,9 @@
+ #define BANDB_DEVICE_ID_US9ML2_4 0xAC30
+ #define BANDB_DEVICE_ID_USPTL4_2 0xAC31
+ #define BANDB_DEVICE_ID_USPTL4_4 0xAC32
+-#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
+-#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
++#define BANDB_DEVICE_ID_USOPTL4_2 0xAC42
++#define BANDB_DEVICE_ID_USOPTL4_4 0xAC44
++#define BANDB_DEVICE_ID_USOPTL2_4 0xAC24
+
+ /* This driver also supports
+ * ATEN UC2324 device using Moschip MCS7840
+@@ -191,6 +192,7 @@ static struct usb_device_id moschip_port
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
++ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
+ {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
+ {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
+ {} /* terminating entry */
+@@ -207,6 +209,7 @@ static __devinitdata struct usb_device_i
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USPTL4_4)},
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_2)},
+ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL4_4)},
++ {USB_DEVICE(USB_VENDOR_ID_BANDB, BANDB_DEVICE_ID_USOPTL2_4)},
+ {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2324)},
+ {USB_DEVICE(USB_VENDOR_ID_ATENINTL, ATENINTL_DEVICE_ID_UC2322)},
+ {} /* terminating entry */
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:54 +0000