aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-01-25 15:42:36 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-25 15:42:36 -0800
commitc2740cbf8a1afa5e0699896629210858923e98e1 (patch)
tree99c2968ac29219d4246e3c08194b54fb54694b76 /usb.current
parent6f1bc475e2d301aa2909e1bd3c5105e51851d4b8 (diff)
downloadpatches-c2740cbf8a1afa5e0699896629210858923e98e1.tar.gz
more patches added
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-cdc-acm-add-another-conexant-modem-to-the-quirks.patch32
-rw-r--r--usb.current/usb-gadget-fix-x-y.patch30
-rw-r--r--usb.current/usb-new-id-for-ti_usb_3410_5052-driver.patch57
-rw-r--r--usb.current/usb-option-add-quanta-hsdpa-data-card-device-ids.patch48
-rw-r--r--usb.current/usb-storage-add-another-unusual_dev-for-off-by-one-bug.patch38
-rw-r--r--usb.current/usb-unusual_dev-usb-storage-needs-to-ignore-a-device.patch40
6 files changed, 245 insertions, 0 deletions
diff --git a/usb.current/usb-cdc-acm-add-another-conexant-modem-to-the-quirks.patch b/usb.current/usb-cdc-acm-add-another-conexant-modem-to-the-quirks.patch
new file mode 100644
index 00000000000000..630f3ef04298bd
--- /dev/null
+++ b/usb.current/usb-cdc-acm-add-another-conexant-modem-to-the-quirks.patch
@@ -0,0 +1,32 @@
+From alan@lxorguk.ukuu.org.uk Sun Jan 25 15:09:07 2009
+From: Alan Cox <alan@lxorguk.ukuu.org.uk>
+Date: Sun, 11 Jan 2009 19:53:10 +0000
+Subject: USB: cdc-acm: Add another conexant modem to the quirks
+To: greg@kroah.com, linux-usb@vger.kernel.org
+Message-ID: <20090111195252.16388.74534.stgit@localhost.localdomain>
+
+
+From: Alan Cox <alan@redhat.com>
+
+Another Conexant, another device with the same quirk
+
+Signed-off-by: Alan Cox <alan@redhat.com>
+Acked-by: Oliver Neukum <oliver@neukum.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/class/cdc-acm.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/usb/class/cdc-acm.c
++++ b/drivers/usb/class/cdc-acm.c
+@@ -1376,6 +1376,9 @@ static struct usb_device_id acm_ids[] =
+ { USB_DEVICE(0x0572, 0x1321), /* Conexant USB MODEM CX93010 */
+ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
+ },
++ { USB_DEVICE(0x0572, 0x1324), /* Conexant USB MODEM RD02-D400 */
++ .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
++ },
+
+ /* control interfaces with various AT-command sets */
+ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_ACM,
diff --git a/usb.current/usb-gadget-fix-x-y.patch b/usb.current/usb-gadget-fix-x-y.patch
new file mode 100644
index 00000000000000..52688d5b9b03a3
--- /dev/null
+++ b/usb.current/usb-gadget-fix-x-y.patch
@@ -0,0 +1,30 @@
+From roel.kluin@gmail.com Sun Jan 25 15:20:37 2009
+From: Roel Kluin <roel.kluin@gmail.com>
+Date: Sat, 17 Jan 2009 16:52:17 +0100
+Subject: USB: GADGET: fix !x & y
+To: augulis.darius@gmail.com, Greg KH <gregkh@suse.de>, dbrownell@users.sourceforge.net
+Cc: linux-usb@vger.kernel.org
+Message-ID: <4971FEB1.2000000@gmail.com>
+
+
+! has a higher precedence than &
+
+Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
+Acked-by: David Brownell <dbrownell@users.sourceforge.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/gadget/imx_udc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/usb/gadget/imx_udc.c
++++ b/drivers/usb/gadget/imx_udc.c
+@@ -297,7 +297,7 @@ void imx_ep_stall(struct imx_ep_struct *
+
+ for (i = 0; i < 100; i ++) {
+ temp = __raw_readl(imx_usb->base + USB_EP_STAT(EP_NO(imx_ep)));
+- if (!temp & EPSTAT_STALL)
++ if (!(temp & EPSTAT_STALL))
+ break;
+ udelay(20);
+ }
diff --git a/usb.current/usb-new-id-for-ti_usb_3410_5052-driver.patch b/usb.current/usb-new-id-for-ti_usb_3410_5052-driver.patch
new file mode 100644
index 00000000000000..882c8765fe012b
--- /dev/null
+++ b/usb.current/usb-new-id-for-ti_usb_3410_5052-driver.patch
@@ -0,0 +1,57 @@
+From oliver@neukum.org Sun Jan 25 15:09:34 2009
+From: Oliver Neukum <oliver@neukum.org>
+Date: Mon, 12 Jan 2009 13:31:16 +0100
+Subject: USB: new id for ti_usb_3410_5052 driver
+To: "Greg Kroah-Hartman" <gregkh@suse.de>, linux-usb@vger.kernel.org
+Message-ID: <200901121331.16871.oliver@neukum.org>
+Content-Disposition: inline
+
+
+This adds a new device id
+
+Signed-off-by: Oliver Neukum <oneukum@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/ti_usb_3410_5052.c | 3 +++
+ drivers/usb/serial/ti_usb_3410_5052.h | 2 ++
+ 2 files changed, 5 insertions(+)
+
+--- a/drivers/usb/serial/ti_usb_3410_5052.c
++++ b/drivers/usb/serial/ti_usb_3410_5052.c
+@@ -184,6 +184,7 @@ static struct usb_device_id ti_id_table_
+ { USB_DEVICE(MTS_VENDOR_ID, MTS_CDMA_PRODUCT_ID) },
+ { USB_DEVICE(MTS_VENDOR_ID, MTS_GSM_PRODUCT_ID) },
+ { USB_DEVICE(MTS_VENDOR_ID, MTS_EDGE_PRODUCT_ID) },
++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+ };
+
+ static struct usb_device_id ti_id_table_5052[4+TI_EXTRA_VID_PID_COUNT+1] = {
+@@ -191,6 +192,7 @@ static struct usb_device_id ti_id_table_
+ { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
+ { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
+ { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+ };
+
+ static struct usb_device_id ti_id_table_combined[6+2*TI_EXTRA_VID_PID_COUNT+1] = {
+@@ -205,6 +207,7 @@ static struct usb_device_id ti_id_table_
+ { USB_DEVICE(TI_VENDOR_ID, TI_5152_BOOT_PRODUCT_ID) },
+ { USB_DEVICE(TI_VENDOR_ID, TI_5052_EEPROM_PRODUCT_ID) },
+ { USB_DEVICE(TI_VENDOR_ID, TI_5052_FIRMWARE_PRODUCT_ID) },
++ { USB_DEVICE(IBM_VENDOR_ID, IBM_4543_PRODUCT_ID) },
+ { }
+ };
+
+--- a/drivers/usb/serial/ti_usb_3410_5052.h
++++ b/drivers/usb/serial/ti_usb_3410_5052.h
+@@ -27,7 +27,9 @@
+
+ /* Vendor and product ids */
+ #define TI_VENDOR_ID 0x0451
++#define IBM_VENDOR_ID 0x04b3
+ #define TI_3410_PRODUCT_ID 0x3410
++#define IBM_4543_PRODUCT_ID 0x4543
+ #define TI_3410_EZ430_ID 0xF430 /* TI ez430 development tool */
+ #define TI_5052_BOOT_PRODUCT_ID 0x5052 /* no EEPROM, no firmware */
+ #define TI_5152_BOOT_PRODUCT_ID 0x5152 /* no EEPROM, no firmware */
diff --git a/usb.current/usb-option-add-quanta-hsdpa-data-card-device-ids.patch b/usb.current/usb-option-add-quanta-hsdpa-data-card-device-ids.patch
new file mode 100644
index 00000000000000..64b4d8cf70d72a
--- /dev/null
+++ b/usb.current/usb-option-add-quanta-hsdpa-data-card-device-ids.patch
@@ -0,0 +1,48 @@
+From Alex.Cheng@quantatw.com Sun Jan 25 15:26:31 2009
+From: <Alex.Cheng@quantatw.com>
+Date: Thu, 22 Jan 2009 16:01:57 +0800
+Subject: USB: option: add QUANTA HSDPA Data Card device ids
+To: <smurf@smurf.noris.de>
+Cc: <Alex.Cheng@quantatw.com>
+Message-ID: <859A00560C629C4FBE3985C4272AE5F504A9D1AD@Mail03.quanta.corp>
+
+
+This patch adds the support for the QUANTA Q101 series HSDPA Data Card.
+With the vendor and product IDs are set properly,
+the data card can be detected and works fine.
+
+Signed-off-by: Alex Cheng <alex.cheng@quantatw.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/serial/option.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/drivers/usb/serial/option.c
++++ b/drivers/usb/serial/option.c
+@@ -158,6 +158,13 @@ static int option_send_setup(struct tty
+ #define HUAWEI_PRODUCT_E143E 0x143E
+ #define HUAWEI_PRODUCT_E143F 0x143F
+
++#define QUANTA_VENDOR_ID 0x0408
++#define QUANTA_PRODUCT_Q101 0xEA02
++#define QUANTA_PRODUCT_Q111 0xEA03
++#define QUANTA_PRODUCT_GLX 0xEA04
++#define QUANTA_PRODUCT_GKE 0xEA05
++#define QUANTA_PRODUCT_GLE 0xEA06
++
+ #define NOVATELWIRELESS_VENDOR_ID 0x1410
+
+ /* YISO PRODUCTS */
+@@ -298,6 +305,11 @@ static struct usb_device_id option_ids[]
+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_GT) },
+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_MODEM_EX) },
+ { USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_ETNA_KOI_MODEM) },
++ { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q101) },
++ { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_Q111) },
++ { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
++ { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
++ { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
+ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E600, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220, 0xff, 0xff, 0xff) },
+ { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E220BIS, 0xff, 0xff, 0xff) },
diff --git a/usb.current/usb-storage-add-another-unusual_dev-for-off-by-one-bug.patch b/usb.current/usb-storage-add-another-unusual_dev-for-off-by-one-bug.patch
new file mode 100644
index 00000000000000..35b93b8aed4f89
--- /dev/null
+++ b/usb.current/usb-storage-add-another-unusual_dev-for-off-by-one-bug.patch
@@ -0,0 +1,38 @@
+From phil@ipom.com Sun Jan 25 15:21:50 2009
+From: Phil Dibowitz <phil@ipom.com>
+Date: Tue, 20 Jan 2009 23:42:52 +0100
+Subject: USB: storage: Add another unusual_dev for off-by-one bug
+To: Greg KH <greg@kroah.com>, USB Dev <linux-usb@vger.kernel.org>, USB Storage list <usb-storage@lists.one-eyed-alien.net>
+Cc: Martijn Hijdra <martijn.hijdra@gmail.com>
+Message-ID: <4976536C.1000205@ipom.com>
+
+
+Argosy has released another device with the off-by-one sector. This is a
+harddrive with an internal cardreader which is affected.
+
+Based on a patch written by Martijn Hijdra <martijn.hijdra@gmail.com>
+
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Cc: Martijn Hijdra <martijn.hijdra@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1261,6 +1261,13 @@ UNUSUAL_DEV( 0x0840, 0x0084, 0x0001, 0x0
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_FIX_CAPACITY),
+
++/* Reported by Martijn Hijdra <martijn.hijdra@gmail.com> */
++UNUSUAL_DEV( 0x0840, 0x0085, 0x0001, 0x0001,
++ "Argosy",
++ "Storage",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_FIX_CAPACITY),
++
+ /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>.
+ * Flag will support Bulk devices which use a standards-violating 32-byte
+ * Command Block Wrapper. Here, the "DC2MEGA" cameras (several brands) with
diff --git a/usb.current/usb-unusual_dev-usb-storage-needs-to-ignore-a-device.patch b/usb.current/usb-unusual_dev-usb-storage-needs-to-ignore-a-device.patch
new file mode 100644
index 00000000000000..0b30bb2ce7ef95
--- /dev/null
+++ b/usb.current/usb-unusual_dev-usb-storage-needs-to-ignore-a-device.patch
@@ -0,0 +1,40 @@
+From phil@ipom.com Sun Jan 25 15:21:21 2009
+From: Phil Dibowitz <phil@ipom.com>
+Date: Tue, 20 Jan 2009 23:48:36 +0100
+Subject: USB: unusual_dev: usb-storage needs to ignore a device
+To: Greg KH <greg@kroah.com>
+Cc: USB Dev <linux-usb@vger.kernel.org>, USB Storage list <usb-storage@lists.one-eyed-alien.net>, The Solutor <thesolutor@gmail.com>
+Message-ID: <497654C4.1000200@ipom.com>
+
+This patch adds an unusual_devs entry for a Sony Ericsson modem. Like many
+other modems, we have to ignore the storage device in order to access the
+modem.
+
+
+At this time usb_modeswitch does not work with this device.
+
+
+Reported-by: The Solutor <thesolutor@gmail.com>.
+Signed-off-by: Phil Dibowitz <phil@ipom.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/storage/unusual_devs.h | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/usb/storage/unusual_devs.h
++++ b/drivers/usb/storage/unusual_devs.h
+@@ -1599,6 +1599,13 @@ UNUSUAL_DEV( 0x0fce, 0xd008, 0x0000, 0x
+ US_SC_DEVICE, US_PR_DEVICE, NULL,
+ US_FL_NO_WP_DETECT ),
+
++/* Reported by The Solutor <thesolutor@gmail.com> */
++UNUSUAL_DEV( 0x0fce, 0xd0e1, 0x0000, 0x0000,
++ "Sony Ericsson",
++ "MD400",
++ US_SC_DEVICE, US_PR_DEVICE, NULL,
++ US_FL_IGNORE_DEVICE),
++
+ /* Reported by Jan Mate <mate@fiit.stuba.sk>
+ * and by Soeren Sonnenburg <kernel@nn7.de> */
+ UNUSUAL_DEV( 0x0fce, 0xe030, 0x0000, 0x0000,