diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-03 16:00:41 -0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-03 16:00:41 -0800 |
commit | 649ea1aaa9cce74d70acbee80f5df99d8b8bb1d2 (patch) | |
tree | fe05de48e5bc5ac88cfab2ce5489ebaf22dd604f | |
parent | 57d27d9ae9f8ae295005ac54e439648b27c6ac9f (diff) | |
download | longterm-queue-2.6.33-649ea1aaa9cce74d70acbee80f5df99d8b8bb1d2.tar.gz |
.33 patches
5 files changed, 174 insertions, 0 deletions
diff --git a/queue-2.6.33/p54usb-add-5-more-usbids.patch b/queue-2.6.33/p54usb-add-5-more-usbids.patch new file mode 100644 index 0000000..ad9dc8d --- /dev/null +++ b/queue-2.6.33/p54usb-add-5-more-usbids.patch @@ -0,0 +1,54 @@ +From 16cad7fba037b34ca32cc0adac65bc089d969fb8 Mon Sep 17 00:00:00 2001 +From: Christian Lamparter <chunkeey@googlemail.com> +Date: Sat, 11 Dec 2010 12:19:48 +0100 +Subject: p54usb: add 5 more USBIDs + +From: Christian Lamparter <chunkeey@googlemail.com> + +commit 16cad7fba037b34ca32cc0adac65bc089d969fb8 upstream. + +This patch adds five more USBIDs to the table. + +Source: +http://www.linuxant.com/pipermail/driverloader/2005q3/002307.html +http://wireless.kernel.org/en/users/Drivers/p54/devices (by M. Davis) + +Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> +Signed-off-by: John W. Linville <linville@tuxdriver.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/net/wireless/p54/p54usb.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -42,6 +42,7 @@ MODULE_FIRMWARE("isl3887usb"); + + static struct usb_device_id p54u_table[] __devinitdata = { + /* Version 1 devices (pci chip + net2280) */ ++ {USB_DEVICE(0x0411, 0x0050)}, /* Buffalo WLI2-USB2-G54 */ + {USB_DEVICE(0x045e, 0x00c2)}, /* Microsoft MN-710 */ + {USB_DEVICE(0x0506, 0x0a11)}, /* 3COM 3CRWE254G72 */ + {USB_DEVICE(0x0707, 0xee06)}, /* SMC 2862W-G */ +@@ -54,9 +55,12 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x0846, 0x4220)}, /* Netgear WG111 */ + {USB_DEVICE(0x09aa, 0x1000)}, /* Spinnaker Proto board */ + {USB_DEVICE(0x0cde, 0x0006)}, /* Medion 40900, Roper Europe */ ++ {USB_DEVICE(0x0db0, 0x6826)}, /* MSI UB54G (MS-6826) */ + {USB_DEVICE(0x107b, 0x55f2)}, /* Gateway WGU-210 (Gemtek) */ + {USB_DEVICE(0x124a, 0x4023)}, /* Shuttle PN15, Airvast WM168g, IOGear GWU513 */ ++ {USB_DEVICE(0x1435, 0x0210)}, /* Inventel UR054G */ + {USB_DEVICE(0x1630, 0x0005)}, /* 2Wire 802.11g USB (v1) / Z-Com */ ++ {USB_DEVICE(0x182d, 0x096b)}, /* Sitecom WL-107 */ + {USB_DEVICE(0x1915, 0x2234)}, /* Linksys WUSB54G OEM */ + {USB_DEVICE(0x1915, 0x2235)}, /* Linksys WUSB54G Portable OEM */ + {USB_DEVICE(0x2001, 0x3701)}, /* DLink DWL-G120 Spinnaker */ +@@ -91,6 +95,7 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x1435, 0x0427)}, /* Inventel UR054G */ + {USB_DEVICE(0x1668, 0x1050)}, /* Actiontec 802UIG-1 */ + {USB_DEVICE(0x2001, 0x3704)}, /* DLink DWL-G122 rev A2 */ ++ {USB_DEVICE(0x2001, 0x3705)}, /* D-Link DWL-G120 rev C1 */ + {USB_DEVICE(0x413c, 0x5513)}, /* Dell WLA3310 USB Wireless Adapter */ + {USB_DEVICE(0x413c, 0x8102)}, /* Spinnaker DUT */ + {USB_DEVICE(0x413c, 0x8104)}, /* Cohiba Proto board */ diff --git a/queue-2.6.33/p54usb-new-usb-id-for-gemtek-wubi-100gw.patch b/queue-2.6.33/p54usb-new-usb-id-for-gemtek-wubi-100gw.patch new file mode 100644 index 0000000..6a0ce7b --- /dev/null +++ b/queue-2.6.33/p54usb-new-usb-id-for-gemtek-wubi-100gw.patch @@ -0,0 +1,31 @@ +From 56e6417b49132d4f56e9f2241d31942b90b46315 Mon Sep 17 00:00:00 2001 +From: Eduardo Costa <ecosta.tmp@gmail.com> +Date: Tue, 14 Dec 2010 14:37:59 -0600 +Subject: p54usb: New USB ID for Gemtek WUBI-100GW + +From: Eduardo Costa <ecosta.tmp@gmail.com> + +commit 56e6417b49132d4f56e9f2241d31942b90b46315 upstream. + +This USB ID is for the WUBI-100GW 802.11g Wireless LAN USB Device that +uses p54usb. + +Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net> +Signed-off-by: Eduardo Costa <ecosta.tmp@gmail.com> +Signed-off-by: John W. Linville <linville@tuxdriver.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/net/wireless/p54/p54usb.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/net/wireless/p54/p54usb.c ++++ b/drivers/net/wireless/p54/p54usb.c +@@ -59,6 +59,7 @@ static struct usb_device_id p54u_table[] + {USB_DEVICE(0x107b, 0x55f2)}, /* Gateway WGU-210 (Gemtek) */ + {USB_DEVICE(0x124a, 0x4023)}, /* Shuttle PN15, Airvast WM168g, IOGear GWU513 */ + {USB_DEVICE(0x1435, 0x0210)}, /* Inventel UR054G */ ++ {USB_DEVICE(0x15a9, 0x0002)}, /* Gemtek WUBI-100GW 802.11g */ + {USB_DEVICE(0x1630, 0x0005)}, /* 2Wire 802.11g USB (v1) / Z-Com */ + {USB_DEVICE(0x182d, 0x096b)}, /* Sitecom WL-107 */ + {USB_DEVICE(0x1915, 0x2234)}, /* Linksys WUSB54G OEM */ diff --git a/queue-2.6.33/series b/queue-2.6.33/series index b567d51..23c45b3 100644 --- a/queue-2.6.33/series +++ b/queue-2.6.33/series @@ -239,3 +239,7 @@ x86-vt-d-quirk-for-masking-vtd-spec-errors-to-platform-error-handling-logic.patc bfa-fix-system-crash-when-reading-sysfs-fc_host-statistics.patch igb-only-use-vlan_gro_receive-if-vlans-are-registered.patch install_special_mapping-skips-security_file_mmap-check.patch +usb-misc-uss720.c-add-another-vendor-product-id.patch +usb-usb-storage-unusual_devs-entry-for-the-samsung-yp-cp3.patch +p54usb-add-5-more-usbids.patch +p54usb-new-usb-id-for-gemtek-wubi-100gw.patch diff --git a/queue-2.6.33/usb-misc-uss720.c-add-another-vendor-product-id.patch b/queue-2.6.33/usb-misc-uss720.c-add-another-vendor-product-id.patch new file mode 100644 index 0000000..91ac613 --- /dev/null +++ b/queue-2.6.33/usb-misc-uss720.c-add-another-vendor-product-id.patch @@ -0,0 +1,39 @@ +From ecc1624a2fff45780959efbcb73ace18fdb3c58d Mon Sep 17 00:00:00 2001 +From: Thomas Sailer <t.sailer@alumni.ethz.ch> +Date: Tue, 14 Dec 2010 16:04:05 +0100 +Subject: USB: misc: uss720.c: add another vendor/product ID + +From: Thomas Sailer <t.sailer@alumni.ethz.ch> + +commit ecc1624a2fff45780959efbcb73ace18fdb3c58d upstream. + +Fabio Battaglia report that he has another cable that works with this +driver, so this patch adds its vendor/product ID. + +Signed-off-by: Thomas Sailer <t.sailer@alumni.ethz.ch> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/misc/uss720.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/usb/misc/uss720.c ++++ b/drivers/usb/misc/uss720.c +@@ -3,7 +3,7 @@ + /* + * uss720.c -- USS720 USB Parport Cable. + * +- * Copyright (C) 1999, 2005 ++ * Copyright (C) 1999, 2005, 2010 + * Thomas Sailer (t.sailer@alumni.ethz.ch) + * + * This program is free software; you can redistribute it and/or modify +@@ -775,6 +775,8 @@ static struct usb_device_id uss720_table + { USB_DEVICE(0x0557, 0x2001) }, + { USB_DEVICE(0x0729, 0x1284) }, + { USB_DEVICE(0x1293, 0x0002) }, ++ { USB_DEVICE(0x1293, 0x0002) }, ++ { USB_DEVICE(0x050d, 0x0002) }, + { } /* Terminating entry */ + }; + diff --git a/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-the-samsung-yp-cp3.patch b/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-the-samsung-yp-cp3.patch new file mode 100644 index 0000000..09d1c3b --- /dev/null +++ b/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-the-samsung-yp-cp3.patch @@ -0,0 +1,46 @@ +From d73a9b3001f29271c2e9f2a806b05a431c5d9591 Mon Sep 17 00:00:00 2001 +From: Vitaly Kuznetsov <vitty@altlinux.ru> +Date: Tue, 14 Dec 2010 10:16:49 -0500 +Subject: USB: usb-storage: unusual_devs entry for the Samsung YP-CP3 + +From: Vitaly Kuznetsov <vitty@altlinux.ru> + +commit d73a9b3001f29271c2e9f2a806b05a431c5d9591 upstream. + +Add an unusual_devs entry for the Samsung YP-CP3 MP4 player. + +User was getting the following errors in dmesg: + usb 2-6: reset high speed USB device using ehci_hcd and address 2 + usb 2-6: reset high speed USB device using ehci_hcd and address 2 + usb 2-6: reset high speed USB device using ehci_hcd and address 2 + usb 2-6: USB disconnect, address 2 + sd 3:0:0:0: [sdb] Assuming drive cache: write through + sdb:<2>ldm_validate_partition_table(): Disk read failed. + Dev sdb: unable to read RDB block 0 + unable to read partition table + +Signed-off-by: Vitaly Kuznetsov <vitty@altlinux.ru> +Acked-by: Alan Stern <stern@rowland.harvard.edu> +CC: Matthew Dharm <mdharm-usb@one-eyed-alien.net> +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 +@@ -481,6 +481,13 @@ UNUSUAL_DEV( 0x04e8, 0x507c, 0x0220, 0x + US_SC_DEVICE, US_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64), + ++/* Reported by Vitaly Kuznetsov <vitty@altlinux.ru> */ ++UNUSUAL_DEV( 0x04e8, 0x5122, 0x0000, 0x9999, ++ "Samsung", ++ "YP-CP3", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_MAX_SECTORS_64 | US_FL_BULK_IGNORE_TAG), ++ + /* Entry and supporting patch by Theodore Kilgore <kilgota@auburn.edu>. + * Device uses standards-violating 32-byte Bulk Command Block Wrappers and + * reports itself as "Proprietary SCSI Bulk." Cf. device entry 0x084d:0x0011. |