diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-13 08:13:01 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-13 08:13:01 -0700 |
commit | 018cd95e285fa0db93f5089b27ef7c4400011503 (patch) | |
tree | cd1567bc74c9639ac8a2f3dc3bc0455cc2fd6d36 | |
parent | 97969a85adeed52770ce78d50c0be476f8fb6d38 (diff) | |
download | longterm-queue-2.6.33-018cd95e285fa0db93f5089b27ef7c4400011503.tar.gz |
.33 patches
6 files changed, 178 insertions, 0 deletions
diff --git a/queue-2.6.33/series b/queue-2.6.33/series new file mode 100644 index 0000000..bbffbd7 --- /dev/null +++ b/queue-2.6.33/series @@ -0,0 +1,5 @@ +staging-rtl8192u-declare-module_firmware.patch +usb-xhci-fix-os-want-to-own-hc.patch +usb-assign-instead-of-equal-in-usbtmc.c.patch +usb-usb-storage-unusual_devs-entry-for-arm-v2m.patch +usb-serial-added-device-id-for-qualcomm-modem-in.patch diff --git a/queue-2.6.33/staging-rtl8192u-declare-module_firmware.patch b/queue-2.6.33/staging-rtl8192u-declare-module_firmware.patch new file mode 100644 index 0000000..104805a --- /dev/null +++ b/queue-2.6.33/staging-rtl8192u-declare-module_firmware.patch @@ -0,0 +1,36 @@ +From 589c3ca00b7886bf743998398884cd4f4d354e17 Mon Sep 17 00:00:00 2001 +From: Stefan Lippers-Hollmann <s.L-H@gmx.de> +Date: Tue, 2 Aug 2011 22:17:25 +0200 +Subject: staging: rtl8192u: declare MODULE_FIRMWARE + +From: Stefan Lippers-Hollmann <s.L-H@gmx.de> + +commit 589c3ca00b7886bf743998398884cd4f4d354e17 upstream. + +declaring MODULE_FIRMWARE has apparently forgotten while removing the embedded +firmware arrays in 0a8692b534e18fcec6eac07551bb37a22659f5c7 (rtl8192u_usb: +Remove built-in firmware images). + +Signed-off-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/staging/rtl8192u/r819xU_firmware.c | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +--- a/drivers/staging/rtl8192u/r819xU_firmware.c ++++ b/drivers/staging/rtl8192u/r819xU_firmware.c +@@ -425,10 +425,7 @@ download_firmware_fail: + + } + +- +- +- +- +- +- ++MODULE_FIRMWARE("RTL8192U/boot.img"); ++MODULE_FIRMWARE("RTL8192U/main.img"); ++MODULE_FIRMWARE("RTL8192U/data.img"); + diff --git a/queue-2.6.33/usb-assign-instead-of-equal-in-usbtmc.c.patch b/queue-2.6.33/usb-assign-instead-of-equal-in-usbtmc.c.patch new file mode 100644 index 0000000..402dcee --- /dev/null +++ b/queue-2.6.33/usb-assign-instead-of-equal-in-usbtmc.c.patch @@ -0,0 +1,29 @@ +From 4f1a7a3e78037721496283ea3e87cfefc64d99c7 Mon Sep 17 00:00:00 2001 +From: Maxim Nikulin <m.a.nikulin@gmail.com> +Date: Sat, 9 Jul 2011 23:44:44 +0700 +Subject: USB: assign instead of equal in usbtmc.c + +From: Maxim Nikulin <m.a.nikulin@gmail.com> + +commit 4f1a7a3e78037721496283ea3e87cfefc64d99c7 upstream. + +Assign operator instead of equality test in the usbtmc_ioctl_abort_bulk_in() function. + +Signed-off-by: Maxim A. Nikulin <M.A.Nikulin@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/class/usbtmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/class/usbtmc.c ++++ b/drivers/usb/class/usbtmc.c +@@ -267,7 +267,7 @@ usbtmc_abort_bulk_in_status: + dev_err(dev, "usb_bulk_msg returned %d\n", rv); + goto exit; + } +- } while ((actual = max_size) && ++ } while ((actual == max_size) && + (n < USBTMC_MAX_READS_TO_CLEAR_BULK_IN)); + + if (actual == max_size) { diff --git a/queue-2.6.33/usb-serial-added-device-id-for-qualcomm-modem-in.patch b/queue-2.6.33/usb-serial-added-device-id-for-qualcomm-modem-in.patch new file mode 100644 index 0000000..4fe7483 --- /dev/null +++ b/queue-2.6.33/usb-serial-added-device-id-for-qualcomm-modem-in.patch @@ -0,0 +1,29 @@ +From e468561739fffb972d486b98f66c723936335136 Mon Sep 17 00:00:00 2001 +From: Vijay Chavan <vijaychavan007@gmail.com> +Date: Tue, 9 Aug 2011 02:41:12 +0530 +Subject: USB: Serial: Added device ID for Qualcomm Modem in + Sagemcom's HiLo3G + +From: Vijay Chavan <vijaychavan007@gmail.com> + +commit e468561739fffb972d486b98f66c723936335136 upstream. + +A new device ID pair is added for Qualcomm Modem present in Sagemcom's HiLo3G module. + +Signed-off-by: Vijay Chavan <VijayChavan007@gmail.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/serial/qcserial.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/qcserial.c ++++ b/drivers/usb/serial/qcserial.c +@@ -43,6 +43,7 @@ static struct usb_device_id id_table[] = + {USB_DEVICE(0x05c6, 0x9203)}, /* Generic Gobi Modem device */ + {USB_DEVICE(0x05c6, 0x9222)}, /* Generic Gobi Modem device */ + {USB_DEVICE(0x05c6, 0x9008)}, /* Generic Gobi QDL device */ ++ {USB_DEVICE(0x05c6, 0x9009)}, /* Generic Gobi Modem device */ + {USB_DEVICE(0x05c6, 0x9201)}, /* Generic Gobi QDL device */ + {USB_DEVICE(0x05c6, 0x9221)}, /* Generic Gobi QDL device */ + {USB_DEVICE(0x05c6, 0x9231)}, /* Generic Gobi QDL device */ diff --git a/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-arm-v2m.patch b/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-arm-v2m.patch new file mode 100644 index 0000000..43f98fa --- /dev/null +++ b/queue-2.6.33/usb-usb-storage-unusual_devs-entry-for-arm-v2m.patch @@ -0,0 +1,47 @@ +From a871e4f5519d8c52430052e1d340dd5710eb5ad6 Mon Sep 17 00:00:00 2001 +From: Nick Bowler <nbowler@elliptictech.com> +Date: Wed, 13 Jul 2011 11:40:09 -0400 +Subject: USB: usb-storage: unusual_devs entry for ARM V2M + motherboard. + +From: Nick Bowler <nbowler@elliptictech.com> + +commit a871e4f5519d8c52430052e1d340dd5710eb5ad6 upstream. + +Connecting the V2M to a Linux host results in a constant stream of +errors spammed to the console, all of the form + + sd 1:0:0:0: ioctl_internal_command return code = 8070000 + : Sense Key : 0x4 [current] + : ASC=0x0 ASCQ=0x0 + +The errors appear to be otherwise harmless. Add an unusual_devs entry +which eliminates all of the error messages. + +Signed-off-by: Nick Bowler <nbowler@elliptictech.com> +Acked-by: Alan Stern <stern@rowland.harvard.edu> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/storage/unusual_devs.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +--- a/drivers/usb/storage/unusual_devs.h ++++ b/drivers/usb/storage/unusual_devs.h +@@ -1977,6 +1977,16 @@ UNUSUAL_DEV( 0x4146, 0xba01, 0x0100, 0x + "Micro Mini 1GB", + US_SC_DEVICE, US_PR_DEVICE, NULL, US_FL_NOT_LOCKABLE ), + ++/* ++ * Nick Bowler <nbowler@elliptictech.com> ++ * SCSI stack spams (otherwise harmless) error messages. ++ */ ++UNUSUAL_DEV( 0xc251, 0x4003, 0x0100, 0x0100, ++ "Keil Software, Inc.", ++ "V2M MotherBoard", ++ US_SC_DEVICE, US_PR_DEVICE, NULL, ++ US_FL_NOT_LOCKABLE), ++ + /* Reported by Andrew Simmons <andrew.simmons@gmail.com> */ + UNUSUAL_DEV( 0xed06, 0x4500, 0x0001, 0x0001, + "DataStor", diff --git a/queue-2.6.33/usb-xhci-fix-os-want-to-own-hc.patch b/queue-2.6.33/usb-xhci-fix-os-want-to-own-hc.patch new file mode 100644 index 0000000..695f888 --- /dev/null +++ b/queue-2.6.33/usb-xhci-fix-os-want-to-own-hc.patch @@ -0,0 +1,32 @@ +From 6768458b17f9bf48a4c3a34e49b20344091b5f7e Mon Sep 17 00:00:00 2001 +From: JiSheng Zhang <jszhang3@gmail.com> +Date: Sat, 16 Jul 2011 11:04:19 +0800 +Subject: USB: xhci: fix OS want to own HC + +From: JiSheng Zhang <jszhang3@gmail.com> + +commit 6768458b17f9bf48a4c3a34e49b20344091b5f7e upstream. + +Software should set XHCI_HC_OS_OWNED bit to request ownership of xHC. + +This patch should be backported to kernels as far back as 2.6.31. + +Signed-off-by: JiSheng Zhang <jszhang3@gmail.com> +Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/host/pci-quirks.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/usb/host/pci-quirks.c ++++ b/drivers/usb/host/pci-quirks.c +@@ -412,7 +412,7 @@ static void __devinit quirk_usb_handoff_ + + /* If the BIOS owns the HC, signal that the OS wants it, and wait */ + if (val & XHCI_HC_BIOS_OWNED) { +- writel(val & XHCI_HC_OS_OWNED, base + ext_cap_offset); ++ writel(val | XHCI_HC_OS_OWNED, base + ext_cap_offset); + + /* Wait for 5 seconds with 10 microsecond polling interval */ + timeout = handshake(base + ext_cap_offset, XHCI_HC_BIOS_OWNED, |