diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-11-17 12:18:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-11-17 12:18:46 -0800 |
| commit | babc5e2cb03ba5842af22ccb5bba2c64d32ecb29 (patch) | |
| tree | 9627280b838d4bd4d93080f7bf60ceb93cad1ee5 | |
| parent | ad6068f4511bc2feb3b419a7ef7168e1688357fc (diff) | |
| download | patches-babc5e2cb03ba5842af22ccb5bba2c64d32ecb29.tar.gz | |
2.6.28-rc5
27 files changed, 1 insertions, 1572 deletions
@@ -16,32 +16,6 @@ driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_deb ################################# # USB patches for 2.6.28 ################################# -usb.current/usb-vstusb-fix-compiler-warning-on-x86-64.patch -usb.current/usb-add-nikon-d300-camera-to-unusual_devs.patch -usb.current/usb-don-t-register-endpoints-for-interfaces-that-are-going-away.patch -usb.current/usb-musb-fix-for-isochronous-in-transfer.patch -usb.current/usb-musb-tusb6010-kill-compile-warning.patch -usb.current/usb-musb-removes-compilation-warning-in-gadget-mode.patch -usb.current/usb-musb-fix-debug-global-variable-name.patch -usb.current/usb-musb-fix-bulk-request-on-different-available-endpoints.patch - -usb.current/usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch -usb.current/usb-mention-urb_free_buffer-in-usb_free_urb-documentation.patch -usb.current/usb-cp2101-add-device-id-for-amb2560.patch -usb.current/usb-cdc-acm.c-fix-recursive-lock-in-acm_start_wb-error-path.patch -usb.current/usb-unusual_devs-entry-for-argosy-usb-mass-storage-interface.patch -usb.current/usb-fix-ps3-usb-shutdown-problems.patch -usb.current/usb-storage-adjust-comment-in-kconfig.patch -usb.current/usb-cp2101-add-enfora-gsm2228.patch -usb.current/usb-remove-optional-bus-bindings-in-isp1760-fixing-runtime-warning.patch -usb.current/usb-unusual-devs-patch-for-nokia-7610-supernova.patch -usb.current/usb-sisusb2vga-driver-add-0x0711-0x0903.patch -usb.current/ub-stub-pre_reset-and-post_reset-to-fix-oops.patch -usb.current/usb-r8a66597-hcd-fix-wrong-data-access-in-superh-on-chip-usb.patch -usb.current/usb-ehci-fix-handling-of-dead-controllers.patch -usb.current/usb-ehci-fix-divide-by-zero-bug.patch -usb.current/usb-gadget-cdc-acm-deadlock-fix.patch -usb.current/usb-net-asix-add-support-for-cables-to-go-usb-ethernet-adapter.patch ##################################################################### diff --git a/usb.current/ub-stub-pre_reset-and-post_reset-to-fix-oops.patch b/usb.current/ub-stub-pre_reset-and-post_reset-to-fix-oops.patch deleted file mode 100644 index 9f521cae73637b..00000000000000 --- a/usb.current/ub-stub-pre_reset-and-post_reset-to-fix-oops.patch +++ /dev/null @@ -1,98 +0,0 @@ -From zaitcev@redhat.com Wed Nov 12 11:50:53 2008 -From: Pete Zaitcev <zaitcev@redhat.com> -Date: Mon, 10 Nov 2008 21:11:11 -0700 -Subject: ub: stub pre_reset and post_reset to fix oops -To: linux-usb@vger.kernel.org -Cc: zaitcev@redhat.com, greg@kroah.com, Alan Stern <stern@rowland.harvard.edu> -Message-ID: <20081110211111.587d068d.zaitcev@redhat.com> - - -Due to recent changes to usb_reset_device, the following hang occurs: - -events/0 D 0000000000000000 0 6 2 - ffff880037477cc0 0000000000000046 ffff880037477c50 ffffffff80237434 - ffffffff80574c80 00000001000a015c 0000000000000286 ffff8800374757d0 - ffff88002a31c860 ffff880037475a00 0000000036779140 ffff880037475a00 -Call Trace: - [<ffffffff80237434>] try_to_del_timer_sync+0x52/0x5b - [<ffffffff8026f86c>] dma_pool_free+0x1a7/0x1ec - [<ffffffffa02a928a>] ub_disconnect+0x8e/0x1ad [ub] - [<ffffffff802407c9>] autoremove_wake_function+0x0/0x2e - [<ffffffff80378959>] usb_unbind_interface+0x5c/0xb7 - [<ffffffff8036ab70>] __device_release_driver+0x95/0xbd - [<ffffffff8036ac70>] device_release_driver+0x21/0x2d - [<ffffffff803789f8>] usb_driver_release_interface+0x44/0x83 - [<ffffffff80378ab9>] usb_forced_unbind_intf+0x17/0x1d - [<ffffffff80371ba4>] usb_reset_device+0x7d/0x114 - [<ffffffffa02aaffd>] ub_reset_task+0x0/0x293 [ub] - [<ffffffffa02ab1c1>] ub_reset_task+0x1c4/0x293 [ub] - [<ffffffff8033dd1e>] flush_to_ldisc+0x0/0x1cd - [<ffffffffa02aaffd>] ub_reset_task+0x0/0x293 [ub] - [<ffffffff8023d302>] run_workqueue+0x87/0x114 - [<ffffffff8023d467>] worker_thread+0xd8/0xe7 - [<ffffffff802407c9>] autoremove_wake_function+0x0/0x2e - [<ffffffff8023d38f>] worker_thread+0x0/0xe7 - [<ffffffff802404c1>] kthread+0x47/0x73 - [<ffffffff8022c8dd>] schedule_tail+0x27/0x60 - [<ffffffff8020c249>] child_rip+0xa/0x11 - [<ffffffff8024047a>] kthread+0x0/0x73 - [<ffffffff8020c23f>] child_rip+0x0/0x11 - -This is because usb_reset_device now unbinds, and that calls disconnect, -which in case of ub waits until the reset completes... which deadlocks. -Worse, this deadlocks keventd and this takes whole box down. - -I'm going to fix this properly later, but let's unbreak the driver -quickly for non-composite devices at least. - -Signed-off-by: Pete Zaitcev <zaitcev@redhat.com> -Cc: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/block/ub.c | 20 ++++++++++++++++++-- - 1 file changed, 18 insertions(+), 2 deletions(-) - ---- a/drivers/block/ub.c -+++ b/drivers/block/ub.c -@@ -1546,8 +1546,6 @@ static void ub_top_sense_done(struct ub_ - - /* - * Reset management -- * XXX Move usb_reset_device to khubd. Hogging kevent is not a good thing. -- * XXX Make usb_sync_reset asynchronous. - */ - - static void ub_reset_enter(struct ub_dev *sc, int try) -@@ -1633,6 +1631,22 @@ static void ub_reset_task(struct work_st - } - - /* -+ * XXX Reset brackets are too much hassle to implement, so just stub them -+ * in order to prevent forced unbinding (which deadlocks solid when our -+ * ->disconnect method waits for the reset to complete and this kills keventd). -+ * -+ * XXX Tell Alan to move usb_unlock_device inside of usb_reset_device, -+ * or else the post_reset is invoked, and restats I/O on a locked device. -+ */ -+static int ub_pre_reset(struct usb_interface *iface) { -+ return 0; -+} -+ -+static int ub_post_reset(struct usb_interface *iface) { -+ return 0; -+} -+ -+/* - * This is called from a process context. - */ - static void ub_revalidate(struct ub_dev *sc, struct ub_lun *lun) -@@ -2446,6 +2460,8 @@ static struct usb_driver ub_driver = { - .probe = ub_probe, - .disconnect = ub_disconnect, - .id_table = ub_usb_ids, -+ .pre_reset = ub_pre_reset, -+ .post_reset = ub_post_reset, - }; - - static int __init ub_init(void) diff --git a/usb.current/usb-add-nikon-d300-camera-to-unusual_devs.patch b/usb.current/usb-add-nikon-d300-camera-to-unusual_devs.patch deleted file mode 100644 index 70b50ae294e5c3..00000000000000 --- a/usb.current/usb-add-nikon-d300-camera-to-unusual_devs.patch +++ /dev/null @@ -1,54 +0,0 @@ -From akpm@linux-foundation.org Fri Oct 31 10:04:56 2008 -From: Paul Ready <lxtwin@homecall.co.uk> -Date: Wed, 29 Oct 2008 14:25:50 -0700 -Subject: USB: add Nikon D300 camera to unusual_devs -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, akpm@linux-foundation.org, lxtwin@homecall.co.uk, stern@rowland.harvard.edu -Message-ID: <200810292125.m9TLPpfW021697@imap1.linux-foundation.org> - - -From: Paul Ready <lxtwin@homecall.co.uk> - -Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11685 - -When A Nikon D300 camera is connected to a system it is seen in -/proc/bus/pci/devices but is not accessible. - -This is seen in the above file: - -T: Bus=01 Lev=01 Prnt=01 Port=05 Cnt=03 Dev#= 11 Spd=480 MxCh= 0 -D: Ver= 2.00 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs= 1 -P: Vendor=04b0 ProdID=041a Rev= 1.03 -S: Manufacturer=NIKON -S: Product=NIKON DSC D300 -S: SerialNumber=000008014379 -C:* #Ifs= 1 Cfg#= 1 Atr=c0 MxPwr= 2mA -I:* If#= 0 Alt= 0 #EPs= 3 Cls=06(still) Sub=01 Prot=01 Driver=usbfs -E: Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms -E: Ad=83(I) Atr=03(Int.) MxPS= 8 Ivl=32ms - -Cc: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -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 -@@ -418,6 +418,13 @@ UNUSUAL_DEV( 0x04b0, 0x0417, 0x0100, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY), - -+/* Reported by paul ready <lxtwin@homecall.co.uk> */ -+UNUSUAL_DEV( 0x04b0, 0x0419, 0x0100, 0x0200, -+ "NIKON", -+ "NIKON DSC D300", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY), -+ - /* Reported by Doug Maxey (dwm@austin.ibm.com) */ - UNUSUAL_DEV( 0x04b3, 0x4001, 0x0110, 0x0110, - "IBM", diff --git a/usb.current/usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch b/usb.current/usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch deleted file mode 100644 index bc5cf85e0b7d34..00000000000000 --- a/usb.current/usb-add-yiso-u893-usb-modem-vendor-and-product-ids-to-option-driver.patch +++ /dev/null @@ -1,42 +0,0 @@ -From leslie.watter@gmail.com Wed Nov 12 09:23:24 2008 -From: "Leslie Watter" <leslie.watter@gmail.com> -Date: Wed, 12 Nov 2008 15:10:07 -0200 -Subject: USB: Add YISO u893 usb modem vendor and product IDs to option driver -To: "Greg KH" <greg@kroah.com> -Message-ID: <8a966de80811120910r1a102576g4cf0f14fcff167e3@mail.gmail.com> -Content-Disposition: inline - - -This patch adds YISO u893 usb modem vendor and product ID to option.c. - -I had a better experience using this modification and the same system. - -Signed-off-by: Leslie Harlley Watter <leslie@watter.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -160,6 +160,11 @@ static int option_send_setup(struct tty - - #define NOVATELWIRELESS_VENDOR_ID 0x1410 - -+/* YISO PRODUCTS */ -+ -+#define YISO_VENDOR_ID 0x0EAB -+#define YISO_PRODUCT_U893 0xC893 -+ - /* MERLIN EVDO PRODUCTS */ - #define NOVATELWIRELESS_PRODUCT_V640 0x1100 - #define NOVATELWIRELESS_PRODUCT_V620 0x1110 -@@ -408,6 +413,7 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, -+ { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_1004) }, diff --git a/usb.current/usb-cdc-acm.c-fix-recursive-lock-in-acm_start_wb-error-path.patch b/usb.current/usb-cdc-acm.c-fix-recursive-lock-in-acm_start_wb-error-path.patch deleted file mode 100644 index bef1888213cce4..00000000000000 --- a/usb.current/usb-cdc-acm.c-fix-recursive-lock-in-acm_start_wb-error-path.patch +++ /dev/null @@ -1,97 +0,0 @@ -From brandon@ifup.org Wed Nov 12 09:27:08 2008 -From: Brandon Philips <brandon@ifup.org> -Date: Thu, 6 Nov 2008 11:19:11 -0800 -Subject: USB: cdc-acm.c: fix recursive lock in acm_start_wb error path -To: oliver@neukum.org, stern@rowland.harvard.edu -Cc: dave@awk.cz, linux-usb@vger.kernel.org, stable@kernel.org -Message-ID: <20081106191911.GC10726@plankton.ifup.org> -Content-Disposition: inline - - -Fixes an obvious bug in cdc-acm by avoiding a recursive lock on -acm_start_wb()'s error path. Should apply towards 2.6.27 stable and -2.6.28. - -============================================= -[ INFO: possible recursive locking detected ] -2.6.27-2-pae #109 ---------------------------------------------- -python/31449 is trying to acquire lock: - (&acm->write_lock){++..}, at: [<f89a0348>] acm_start_wb+0x5c/0x7b [cdc_acm] - -but task is already holding lock: - (&acm->write_lock){++..}, at: [<f89a04fb>] acm_tty_write+0xe1/0x167 [cdc_acm] - -other info that might help us debug this: -2 locks held by python/31449: - #0: (&tty->atomic_write_lock){--..}, at: [<c0260fae>] tty_write_lock+0x14/0x3b - #1: (&acm->write_lock){++..}, at: [<f89a04fb>] acm_tty_write+0xe1/0x167 [cdc_acm] - -stack backtrace: -Pid: 31449, comm: python Not tainted 2.6.27-2-pae #109 - [<c030f42f>] ? printk+0xf/0x18 - [<c0149f33>] __lock_acquire+0xc7b/0x1316 - [<c014a63e>] lock_acquire+0x70/0x97 - [<f89a0348>] ? acm_start_wb+0x5c/0x7b [cdc_acm] - [<c0312109>] _spin_lock_irqsave+0x37/0x47 - [<f89a0348>] ? acm_start_wb+0x5c/0x7b [cdc_acm] - [<f89a0348>] acm_start_wb+0x5c/0x7b [cdc_acm] - [<f89a055d>] acm_tty_write+0x143/0x167 [cdc_acm] - [<c0262a98>] write_chan+0x1cd/0x297 - [<c012527e>] ? default_wake_function+0x0/0xd - [<c026111e>] tty_write+0x149/0x1b9 - [<c02628cb>] ? write_chan+0x0/0x297 - [<c01912c5>] ? rw_verify_area+0x76/0x98 - [<c0260fd5>] ? tty_write+0x0/0x1b9 - [<c01919ba>] vfs_write+0x8c/0x136 - [<c0191afd>] sys_write+0x3b/0x60 - [<c0103beb>] sysenter_do_call+0x12/0x3f - ======================= - -Signed-off-by: Brandon Philips <bphilips@suse.de> -Cc: Oliver Neukum <oliver@neukum.org> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/class/cdc-acm.c | 9 ++++----- - 1 file changed, 4 insertions(+), 5 deletions(-) - ---- a/drivers/usb/class/cdc-acm.c -+++ b/drivers/usb/class/cdc-acm.c -@@ -158,16 +158,12 @@ static int acm_wb_is_avail(struct acm *a - } - - /* -- * Finish write. -+ * Finish write. Caller must hold acm->write_lock - */ - static void acm_write_done(struct acm *acm, struct acm_wb *wb) - { -- unsigned long flags; -- -- spin_lock_irqsave(&acm->write_lock, flags); - wb->use = 0; - acm->transmitting--; -- spin_unlock_irqrestore(&acm->write_lock, flags); - } - - /* -@@ -482,6 +478,7 @@ static void acm_write_bulk(struct urb *u - { - struct acm_wb *wb = urb->context; - struct acm *acm = wb->instance; -+ unsigned long flags; - - if (verbose || urb->status - || (urb->actual_length != urb->transfer_buffer_length)) -@@ -490,7 +487,9 @@ static void acm_write_bulk(struct urb *u - urb->transfer_buffer_length, - urb->status); - -+ spin_lock_irqsave(&acm->write_lock, flags); - acm_write_done(acm, wb); -+ spin_unlock_irqrestore(&acm->write_lock, flags); - if (ACM_READY(acm)) - schedule_work(&acm->work); - else diff --git a/usb.current/usb-cp2101-add-device-id-for-amb2560.patch b/usb.current/usb-cp2101-add-device-id-for-amb2560.patch deleted file mode 100644 index 548daa15de1d8b..00000000000000 --- a/usb.current/usb-cp2101-add-device-id-for-amb2560.patch +++ /dev/null @@ -1,26 +0,0 @@ -From craig@microtron.org.uk Wed Nov 12 09:25:52 2008 -From: Craig Shelley <craig@microtron.org.uk> -Date: Sun, 9 Nov 2008 20:17:54 +0000 -Subject: USB: CP2101 Add device ID for AMB2560 -Cc: linux-usb@vger.kernel.org - - -This patch adds the device vendor and product IDs for Amber Wireless AMB2560 - -Signed-off-by: Craig Shelley <craig@microtron.org.uk> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp2101.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp2101.c -+++ b/drivers/usb/serial/cp2101.c -@@ -85,6 +85,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x8218) }, /* Lipowsky Industrie Elektronik GmbH, HARP-1 */ - { USB_DEVICE(0x10c4, 0x8293) }, /* Telegesys ETRX2USB */ - { USB_DEVICE(0x10C4, 0x8341) }, /* Siemens MC35PU GPRS Modem */ -+ { USB_DEVICE(0x10C4, 0x83A8) }, /* Amber Wireless AMB2560 */ - { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xEA61) }, /* Silicon Labs factory default */ - { USB_DEVICE(0x10C4, 0xF001) }, /* Elan Digital Systems USBscope50 */ diff --git a/usb.current/usb-cp2101-add-enfora-gsm2228.patch b/usb.current/usb-cp2101-add-enfora-gsm2228.patch deleted file mode 100644 index 01c695940094ef..00000000000000 --- a/usb.current/usb-cp2101-add-enfora-gsm2228.patch +++ /dev/null @@ -1,33 +0,0 @@ -From akpm@linux-foundation.org Wed Nov 12 11:31:08 2008 -From: Damir N Abdullin <damir@mimas.ru> -Date: Thu, 30 Oct 2008 13:52:38 -0700 -Subject: USB: cp2101: add Enfora GSM2228 -Subject: + usb-serial-cp2101-add-enfora-gsm2228.patch added to -mm tree -To: mm-commits@vger.kernel.org -Cc: damir@mimas.ru, greg@kroah.com -Message-ID: <200810302052.m9UKqcAb002790@imap1.linux-foundation.org> - - -From: Damir N Abdullin <damir@mimas.ru> - -Enfora GSM2228 based on Cygnal Integrated Products chip uses the same -cp2101 driver. - -Signed-off-by: Damir N Abdullin <damir@mimas.ru> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/cp2101.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/serial/cp2101.c -+++ b/drivers/usb/serial/cp2101.c -@@ -67,6 +67,7 @@ static struct usb_device_id id_table [] - { USB_DEVICE(0x10C4, 0x800A) }, /* SPORTident BSM7-D-USB main station */ - { USB_DEVICE(0x10C4, 0x803B) }, /* Pololu USB-serial converter */ - { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ -+ { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ - { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ - { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ - { USB_DEVICE(0x10C4, 0x80CA) }, /* Degree Controls Inc */ diff --git a/usb.current/usb-don-t-register-endpoints-for-interfaces-that-are-going-away.patch b/usb.current/usb-don-t-register-endpoints-for-interfaces-that-are-going-away.patch deleted file mode 100644 index de97099529a472..00000000000000 --- a/usb.current/usb-don-t-register-endpoints-for-interfaces-that-are-going-away.patch +++ /dev/null @@ -1,71 +0,0 @@ -From stern@rowland.harvard.edu Fri Oct 31 10:06:30 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Wed, 29 Oct 2008 15:16:58 -0400 (EDT) -Subject: USB: don't register endpoints for interfaces that are going away -To: Greg KH <greg@kroah.com> -Cc: Kay Sievers <kay.sievers@vrfy.org>, USB list <linux-usb@vger.kernel.org> -Message-ID: <Pine.LNX.4.44L0.0810291514410.2180-100000@iolanthe.rowland.org> - - -This patch (as1155) fixes a bug in usbcore. When interfaces are -deleted, either because the device was disconnected or because of a -configuration change, the extra attribute files and child endpoint -devices may get left behind. This is because the core removes them -before calling device_del(). But during device_del(), after the -driver is unbound the core will reinstall altsetting 0 and recreate -those extra attributes and children. - -The patch prevents this by adding a flag to record when the interface -is in the midst of being unregistered. When the flag is set, the -attribute files and child devices will not be created. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Cc: stable <stable@kernel.org> [2.6.27, 2.6.26, 2.6.25] -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - - ---- - drivers/usb/core/message.c | 1 + - drivers/usb/core/sysfs.c | 2 +- - include/linux/usb.h | 2 ++ - 3 files changed, 4 insertions(+), 1 deletion(-) - ---- a/drivers/usb/core/message.c -+++ b/drivers/usb/core/message.c -@@ -1091,6 +1091,7 @@ void usb_disable_device(struct usb_devic - continue; - dev_dbg(&dev->dev, "unregistering interface %s\n", - dev_name(&interface->dev)); -+ interface->unregistering = 1; - usb_remove_sysfs_intf_files(interface); - device_del(&interface->dev); - } ---- a/drivers/usb/core/sysfs.c -+++ b/drivers/usb/core/sysfs.c -@@ -840,7 +840,7 @@ int usb_create_sysfs_intf_files(struct u - struct usb_host_interface *alt = intf->cur_altsetting; - int retval; - -- if (intf->sysfs_files_created) -+ if (intf->sysfs_files_created || intf->unregistering) - return 0; - - /* The interface string may be present in some altsettings ---- a/include/linux/usb.h -+++ b/include/linux/usb.h -@@ -108,6 +108,7 @@ enum usb_interface_condition { - * (in probe()), bound to a driver, or unbinding (in disconnect()) - * @is_active: flag set when the interface is bound and not suspended. - * @sysfs_files_created: sysfs attributes exist -+ * @unregistering: flag set when the interface is being unregistered - * @needs_remote_wakeup: flag set when the driver requires remote-wakeup - * capability during autosuspend. - * @needs_altsetting0: flag set when a set-interface request for altsetting 0 -@@ -163,6 +164,7 @@ struct usb_interface { - enum usb_interface_condition condition; /* state of binding */ - unsigned is_active:1; /* the interface is not suspended */ - unsigned sysfs_files_created:1; /* the sysfs attributes exist */ -+ unsigned unregistering:1; /* unregistration is in progress */ - unsigned needs_remote_wakeup:1; /* driver requires remote wakeup */ - unsigned needs_altsetting0:1; /* switch to altsetting 0 is pending */ - unsigned needs_binding:1; /* needs delayed unbind/rebind */ diff --git a/usb.current/usb-ehci-fix-divide-by-zero-bug.patch b/usb.current/usb-ehci-fix-divide-by-zero-bug.patch deleted file mode 100644 index 92b15363a0dd6d..00000000000000 --- a/usb.current/usb-ehci-fix-divide-by-zero-bug.patch +++ /dev/null @@ -1,43 +0,0 @@ -From stern@rowland.harvard.edu Wed Nov 12 15:05:38 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Wed, 12 Nov 2008 17:02:57 -0500 (EST) -Subject: USB: EHCI: fix divide-by-zero bug -To: Greg KH <greg@kroah.com> -Cc: David Brownell <david-b@pacbell.net> -Message-ID: <Pine.LNX.4.44L0.0811121702010.2186-100000@iolanthe.rowland.org> - - -This patch (as1164) fixes a bug in the EHCI scheduler. The interval -value it uses is already in linear format, not logarithmically coded. -The existing code can sometimes crash the system by trying to divide -by zero. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Cc: David Brownell <david-b@pacbell.net> -Cc: Stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-sched.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/ehci-sched.c -+++ b/drivers/usb/host/ehci-sched.c -@@ -918,7 +918,7 @@ iso_stream_init ( - */ - stream->usecs = HS_USECS_ISO (maxp); - bandwidth = stream->usecs * 8; -- bandwidth /= 1 << (interval - 1); -+ bandwidth /= interval; - - } else { - u32 addr; -@@ -951,7 +951,7 @@ iso_stream_init ( - } else - stream->raw_mask = smask_out [hs_transfers - 1]; - bandwidth = stream->usecs + stream->c_usecs; -- bandwidth /= 1 << (interval + 2); -+ bandwidth /= interval << 3; - - /* stream->splits gets created from raw_mask later */ - stream->address = cpu_to_hc32(ehci, addr); diff --git a/usb.current/usb-ehci-fix-handling-of-dead-controllers.patch b/usb.current/usb-ehci-fix-handling-of-dead-controllers.patch deleted file mode 100644 index 198399a370416f..00000000000000 --- a/usb.current/usb-ehci-fix-handling-of-dead-controllers.patch +++ /dev/null @@ -1,89 +0,0 @@ -From stern@rowland.harvard.edu Wed Nov 12 15:05:17 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Wed, 12 Nov 2008 17:04:53 -0500 (EST) -Subject: USB: EHCI: fix handling of dead controllers -To: Greg KH <greg@kroah.com> -Cc: David Brownell <david-b@pacbell.net> -Message-ID: <Pine.LNX.4.44L0.0811121702580.2186-100000@iolanthe.rowland.org> - - -This patch (as1165) makes a few small changes in the logic used by -ehci-hcd when it encounters a controller error: - - Instead of printing out the masked status, it prints the - original status as read directly from the hardware. - - It doesn't check for the STS_HALT status bit before taking - action. The mere fact that the STS_FATAL bit is set means - that something bad has happened and the controller needs to - be reset. With the old code this test could never succeed - because the STS_HALT bit was masked out from the status. - -I anticipate that this will prevent the occasional "irq X: nobody cared" -problem people encounter when their EHCI controllers die. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Cc: David Brownell <david-b@pacbell.net> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-hcd.c | 25 ++++++++++++------------- - 1 file changed, 12 insertions(+), 13 deletions(-) - ---- a/drivers/usb/host/ehci-hcd.c -+++ b/drivers/usb/host/ehci-hcd.c -@@ -643,7 +643,7 @@ static int ehci_run (struct usb_hcd *hcd - static irqreturn_t ehci_irq (struct usb_hcd *hcd) - { - struct ehci_hcd *ehci = hcd_to_ehci (hcd); -- u32 status, pcd_status = 0, cmd; -+ u32 status, masked_status, pcd_status = 0, cmd; - int bh; - - spin_lock (&ehci->lock); -@@ -656,14 +656,14 @@ static irqreturn_t ehci_irq (struct usb_ - goto dead; - } - -- status &= INTR_MASK; -- if (!status) { /* irq sharing? */ -+ masked_status = status & INTR_MASK; -+ if (!masked_status) { /* irq sharing? */ - spin_unlock(&ehci->lock); - return IRQ_NONE; - } - - /* clear (just) interrupts */ -- ehci_writel(ehci, status, &ehci->regs->status); -+ ehci_writel(ehci, masked_status, &ehci->regs->status); - cmd = ehci_readl(ehci, &ehci->regs->command); - bh = 0; - -@@ -734,18 +734,17 @@ static irqreturn_t ehci_irq (struct usb_ - - /* PCI errors [4.15.2.4] */ - if (unlikely ((status & STS_FATAL) != 0)) { -+ ehci_err(ehci, "fatal error\n"); - dbg_cmd(ehci, "fatal", cmd); - dbg_status(ehci, "fatal", status); -- if (status & STS_HALT) { -- ehci_err (ehci, "fatal error\n"); -+ ehci_halt(ehci); - dead: -- ehci_reset (ehci); -- ehci_writel(ehci, 0, &ehci->regs->configured_flag); -- /* generic layer kills/unlinks all urbs, then -- * uses ehci_stop to clean up the rest -- */ -- bh = 1; -- } -+ ehci_reset(ehci); -+ ehci_writel(ehci, 0, &ehci->regs->configured_flag); -+ /* generic layer kills/unlinks all urbs, then -+ * uses ehci_stop to clean up the rest -+ */ -+ bh = 1; - } - - if (bh) diff --git a/usb.current/usb-fix-ps3-usb-shutdown-problems.patch b/usb.current/usb-fix-ps3-usb-shutdown-problems.patch deleted file mode 100644 index 4745e2dcc4bf53..00000000000000 --- a/usb.current/usb-fix-ps3-usb-shutdown-problems.patch +++ /dev/null @@ -1,61 +0,0 @@ -From geoffrey.levand@am.sony.com Wed Nov 12 09:29:43 2008 -From: Geoff Levand <geoffrey.levand@am.sony.com> -Date: Fri, 31 Oct 2008 13:52:54 -0700 -Subject: USB: Fix PS3 USB shutdown problems -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org, stern@rowland.harvard.edu, david-b@pacbell.net -Message-ID: <490B7026.9020506@am.sony.com> - - -Add ehci_shutdown() or ohci_shutdown() calls to the USB -PS3 bus glue. ehci_shutdown() and ohci_shutdown() do some -controller specific cleanups not done by usb_remove_hcd(). - -Fixes errors on shutdown or reboot similar to these: - - ps3-ehci-driver sb_07: HC died; cleaning up - irq 51: nobody cared (try booting with the "irqpoll" option) - -Related bugzilla reports: - - http://bugzilla.kernel.org/show_bug.cgi?id=11819 - http://bugzilla.terrasoftsolutions.com/show_bug.cgi?id=317 - -Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-ps3.c | 1 + - drivers/usb/host/ohci-ps3.c | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - ---- a/drivers/usb/host/ehci-ps3.c -+++ b/drivers/usb/host/ehci-ps3.c -@@ -205,6 +205,7 @@ static int ps3_ehci_remove(struct ps3_sy - - tmp = hcd->irq; - -+ ehci_shutdown(hcd); - usb_remove_hcd(hcd); - - ps3_system_bus_set_driver_data(dev, NULL); ---- a/drivers/usb/host/ohci-ps3.c -+++ b/drivers/usb/host/ohci-ps3.c -@@ -192,7 +192,7 @@ fail_start: - return result; - } - --static int ps3_ohci_remove (struct ps3_system_bus_device *dev) -+static int ps3_ohci_remove(struct ps3_system_bus_device *dev) - { - unsigned int tmp; - struct usb_hcd *hcd = -@@ -205,6 +205,7 @@ static int ps3_ohci_remove (struct ps3_s - - tmp = hcd->irq; - -+ ohci_shutdown(hcd); - usb_remove_hcd(hcd); - - ps3_system_bus_set_driver_data(dev, NULL); diff --git a/usb.current/usb-gadget-cdc-acm-deadlock-fix.patch b/usb.current/usb-gadget-cdc-acm-deadlock-fix.patch deleted file mode 100644 index 4740221657fced..00000000000000 --- a/usb.current/usb-gadget-cdc-acm-deadlock-fix.patch +++ /dev/null @@ -1,46 +0,0 @@ -From david-b@pacbell.net Wed Nov 12 14:46:46 2008 -From: David Brownell <david-b@pacbell.net> -Date: Wed, 12 Nov 2008 11:35:13 -0800 -Subject: USB: gadget: cdc-acm deadlock fix -To: Greg KH <greg@kroah.com>, linux-usb@vger.kernel.org -Message-ID: <200811121135.13963.david-b@pacbell.net> -Content-Disposition: inline - - -From: David Brownell <dbrownell@users.sourceforge.net> - -This fixes a deadlock appearing with some USB peripheral drivers -when running CDC ACM gadget code. - -The newish (2.6.27) CDC ACM event notification mechanism sends -messages (IN to the host) which are short enough to fit in most -FIFOs. That means that with some peripheral controller drivers -(evidently not the ones used to verify the notification code!!) -the completion callback can be issued before queue() returns. - -The deadlock would come because the completion callback and the -event-issuing code shared a spinlock. Fix is trivial: drop -that lock while queueing the message. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/f_acm.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/usb/gadget/f_acm.c -+++ b/drivers/usb/gadget/f_acm.c -@@ -463,7 +463,11 @@ static int acm_cdc_notify(struct f_acm * - notify->wLength = cpu_to_le16(length); - memcpy(buf, data, length); - -+ /* ep_queue() can complete immediately if it fills the fifo... */ -+ spin_unlock(&acm->lock); - status = usb_ep_queue(ep, req, GFP_ATOMIC); -+ spin_lock(&acm->lock); -+ - if (status < 0) { - ERROR(acm->port.func.config->cdev, - "acm ttyGS%d can't notify serial state, %d\n", diff --git a/usb.current/usb-mention-urb_free_buffer-in-usb_free_urb-documentation.patch b/usb.current/usb-mention-urb_free_buffer-in-usb_free_urb-documentation.patch deleted file mode 100644 index f4fae16c44e016..00000000000000 --- a/usb.current/usb-mention-urb_free_buffer-in-usb_free_urb-documentation.patch +++ /dev/null @@ -1,34 +0,0 @@ -From rabin@rab.in Wed Nov 12 09:25:32 2008 -From: Rabin Vincent <rabin@rab.in> -Date: Sun, 9 Nov 2008 11:40:30 +0530 -Subject: USB: mention URB_FREE_BUFFER in usb_free_urb documentation -To: gregkh@suse.de -Cc: linux-usb@vger.kernel.org -Message-ID: <20081109061030.GA2904@debian> -Content-Disposition: inline - - -The usb_free_urb comment says that the transfer buffer will not be -freed, but this is not the case when URB_FREE_BUFFER is set. - -Signed-off-by: Rabin Vincent <rabin@rab.in> -Acked-by: Marcel Holtmann <marcel@holtmann.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/core/urb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/core/urb.c -+++ b/drivers/usb/core/urb.c -@@ -85,8 +85,8 @@ EXPORT_SYMBOL_GPL(usb_alloc_urb); - * Must be called when a user of a urb is finished with it. When the last user - * of the urb calls this function, the memory of the urb is freed. - * -- * Note: The transfer buffer associated with the urb is not freed, that must be -- * done elsewhere. -+ * Note: The transfer buffer associated with the urb is not freed unless the -+ * URB_FREE_BUFFER transfer flag is set. - */ - void usb_free_urb(struct urb *urb) - { diff --git a/usb.current/usb-musb-fix-bulk-request-on-different-available-endpoints.patch b/usb.current/usb-musb-fix-bulk-request-on-different-available-endpoints.patch deleted file mode 100644 index 4af882ee7ca19f..00000000000000 --- a/usb.current/usb-musb-fix-bulk-request-on-different-available-endpoints.patch +++ /dev/null @@ -1,181 +0,0 @@ -From felipe.balbi@nokia.com Fri Oct 31 09:57:56 2008 -From: Felipe Balbi <felipe.balbi@nokia.com> -Date: Wed, 29 Oct 2008 15:10:35 +0200 -Subject: usb: musb: fix BULK request on different available endpoints -To: linux-usb@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1225285839-3085-6-git-send-email-felipe.balbi@nokia.com> - - -From: Ajay Kumar Gupta <ajay.gupta@ti.com> - -Fixes co-working issue of usb serial device with usb/net devices while -oter endpoints are free and can be used.This patch implements the policy -that if endpoint resources are available then different BULK request goes -to different endpoint otherwise they are multiplexed to one reserved -endpoint as currently done. - -Switch statement case is reordered in musb_giveback() to take care of -bulk request both in multiplex scenario and otherwise. - -NAK limit scheme has to be added for multiplexed BULK request scenario -to avoid endpoint starvation due to usb/net devices. - -Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/musb_host.c | 82 +++++++++++++++++++++++-------------------- - drivers/usb/musb/musb_host.h | 1 - 2 files changed, 46 insertions(+), 37 deletions(-) - ---- a/drivers/usb/musb/musb_host.c -+++ b/drivers/usb/musb/musb_host.c -@@ -378,6 +378,19 @@ musb_giveback(struct musb_qh *qh, struct - - switch (qh->type) { - -+ case USB_ENDPOINT_XFER_CONTROL: -+ case USB_ENDPOINT_XFER_BULK: -+ /* fifo policy for these lists, except that NAKing -+ * should rotate a qh to the end (for fairness). -+ */ -+ if (qh->mux == 1) { -+ head = qh->ring.prev; -+ list_del(&qh->ring); -+ kfree(qh); -+ qh = first_qh(head); -+ break; -+ } -+ - case USB_ENDPOINT_XFER_ISOC: - case USB_ENDPOINT_XFER_INT: - /* this is where periodic bandwidth should be -@@ -388,17 +401,6 @@ musb_giveback(struct musb_qh *qh, struct - kfree(qh); - qh = NULL; - break; -- -- case USB_ENDPOINT_XFER_CONTROL: -- case USB_ENDPOINT_XFER_BULK: -- /* fifo policy for these lists, except that NAKing -- * should rotate a qh to the end (for fairness). -- */ -- head = qh->ring.prev; -- list_del(&qh->ring); -- kfree(qh); -- qh = first_qh(head); -- break; - } - } - return qh; -@@ -1708,22 +1710,9 @@ static int musb_schedule( - struct list_head *head = NULL; - - /* use fixed hardware for control and bulk */ -- switch (qh->type) { -- case USB_ENDPOINT_XFER_CONTROL: -+ if (qh->type == USB_ENDPOINT_XFER_CONTROL) { - head = &musb->control; - hw_ep = musb->control_ep; -- break; -- case USB_ENDPOINT_XFER_BULK: -- hw_ep = musb->bulk_ep; -- if (is_in) -- head = &musb->in_bulk; -- else -- head = &musb->out_bulk; -- break; -- } -- if (head) { -- idle = list_empty(head); -- list_add_tail(&qh->ring, head); - goto success; - } - -@@ -1762,19 +1751,34 @@ static int musb_schedule( - else - diff = hw_ep->max_packet_sz_tx - qh->maxpacket; - -- if (diff > 0 && best_diff > diff) { -+ if (diff >= 0 && best_diff > diff) { - best_diff = diff; - best_end = epnum; - } - } -- if (best_end < 0) -+ /* use bulk reserved ep1 if no other ep is free */ -+ if (best_end > 0 && qh->type == USB_ENDPOINT_XFER_BULK) { -+ hw_ep = musb->bulk_ep; -+ if (is_in) -+ head = &musb->in_bulk; -+ else -+ head = &musb->out_bulk; -+ goto success; -+ } else if (best_end < 0) { - return -ENOSPC; -+ } - - idle = 1; -+ qh->mux = 0; - hw_ep = musb->endpoints + best_end; - musb->periodic[best_end] = qh; - DBG(4, "qh %p periodic slot %d\n", qh, best_end); - success: -+ if (head) { -+ idle = list_empty(head); -+ list_add_tail(&qh->ring, head); -+ qh->mux = 1; -+ } - qh->hw_ep = hw_ep; - qh->hep->hcpriv = qh; - if (idle) -@@ -2052,11 +2056,13 @@ static int musb_urb_dequeue(struct usb_h - sched = &musb->control; - break; - case USB_ENDPOINT_XFER_BULK: -- if (usb_pipein(urb->pipe)) -- sched = &musb->in_bulk; -- else -- sched = &musb->out_bulk; -- break; -+ if (qh->mux == 1) { -+ if (usb_pipein(urb->pipe)) -+ sched = &musb->in_bulk; -+ else -+ sched = &musb->out_bulk; -+ break; -+ } - default: - /* REVISIT when we get a schedule tree, periodic - * transfers won't always be at the head of a -@@ -2104,11 +2110,13 @@ musb_h_disable(struct usb_hcd *hcd, stru - sched = &musb->control; - break; - case USB_ENDPOINT_XFER_BULK: -- if (is_in) -- sched = &musb->in_bulk; -- else -- sched = &musb->out_bulk; -- break; -+ if (qh->mux == 1) { -+ if (is_in) -+ sched = &musb->in_bulk; -+ else -+ sched = &musb->out_bulk; -+ break; -+ } - default: - /* REVISIT when we get a schedule tree, periodic transfers - * won't always be at the head of a singleton queue... ---- a/drivers/usb/musb/musb_host.h -+++ b/drivers/usb/musb/musb_host.h -@@ -53,6 +53,7 @@ struct musb_qh { - - struct list_head ring; /* of musb_qh */ - /* struct musb_qh *next; */ /* for periodic tree */ -+ u8 mux; /* qh multiplexed to hw_ep */ - - unsigned offset; /* in urb->transfer_buffer */ - unsigned segsize; /* current xfer fragment */ diff --git a/usb.current/usb-musb-fix-debug-global-variable-name.patch b/usb.current/usb-musb-fix-debug-global-variable-name.patch deleted file mode 100644 index 012fabef0660cd..00000000000000 --- a/usb.current/usb-musb-fix-debug-global-variable-name.patch +++ /dev/null @@ -1,58 +0,0 @@ -From felipe.balbi@nokia.com Fri Oct 31 09:57:03 2008 -From: Felipe Balbi <felipe.balbi@nokia.com> -Date: Wed, 29 Oct 2008 15:10:39 +0200 -Subject: [patch-2.6.28-rc 9/9] usb: musb: fix debug global variable name -To: linux-usb@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1225285839-3085-10-git-send-email-felipe.balbi@nokia.com> - - -In order to avoid namespace conflicts, add a prefix -to our kernel-wise symbol. - -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/musb_core.c | 6 +++--- - drivers/usb/musb/musb_debug.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - ---- a/drivers/usb/musb/musb_core.c -+++ b/drivers/usb/musb/musb_core.c -@@ -114,8 +114,8 @@ - - - --unsigned debug; --module_param(debug, uint, S_IRUGO | S_IWUSR); -+unsigned musb_debug; -+module_param(musb_debug, uint, S_IRUGO | S_IWUSR); - MODULE_PARM_DESC(debug, "Debug message level. Default = 0"); - - #define DRIVER_AUTHOR "Mentor Graphics, Texas Instruments, Nokia" -@@ -2248,7 +2248,7 @@ static int __init musb_init(void) - "host" - #endif - ", debug=%d\n", -- musb_driver_name, debug); -+ musb_driver_name, musb_debug); - return platform_driver_probe(&musb_driver, musb_probe); - } - ---- a/drivers/usb/musb/musb_debug.h -+++ b/drivers/usb/musb/musb_debug.h -@@ -48,11 +48,11 @@ - __func__, __LINE__ , ## args); \ - } } while (0) - --extern unsigned debug; -+extern unsigned musb_debug; - - static inline int _dbg_level(unsigned l) - { -- return debug >= l; -+ return musb_debug >= l; - } - - #define DBG(level, fmt, args...) xprintk(level, KERN_DEBUG, fmt, ## args) diff --git a/usb.current/usb-musb-fix-for-isochronous-in-transfer.patch b/usb.current/usb-musb-fix-for-isochronous-in-transfer.patch deleted file mode 100644 index 1b599436d0948f..00000000000000 --- a/usb.current/usb-musb-fix-for-isochronous-in-transfer.patch +++ /dev/null @@ -1,148 +0,0 @@ -From felipe.balbi@nokia.com Fri Oct 31 09:53:39 2008 -From: Felipe Balbi <felipe.balbi@nokia.com> -Date: Wed, 29 Oct 2008 15:10:31 +0200 -Subject: usb: musb: Fix for isochronous IN transfer -To: linux-usb@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1225285839-3085-2-git-send-email-felipe.balbi@nokia.com> - - -From: Ajay Kumar Gupta <ajay.gupta@ti.com> - -Fixes blurred capture images in dma mode. Isochronous error field in -urb and source data buffer pointer were not updated properly in dma -mode. - -Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/musb_host.c | 77 +++++++++++++++++++++++++++++++------------ - 1 file changed, 57 insertions(+), 20 deletions(-) - ---- a/drivers/usb/musb/musb_host.c -+++ b/drivers/usb/musb/musb_host.c -@@ -1507,10 +1507,29 @@ void musb_host_rx(struct musb *musb, u8 - musb_writew(hw_ep->regs, MUSB_RXCSR, val); - - #ifdef CONFIG_USB_INVENTRA_DMA -+ if (usb_pipeisoc(pipe)) { -+ struct usb_iso_packet_descriptor *d; -+ -+ d = urb->iso_frame_desc + qh->iso_idx; -+ d->actual_length = xfer_len; -+ -+ /* even if there was an error, we did the dma -+ * for iso_frame_desc->length -+ */ -+ if (d->status != EILSEQ && d->status != -EOVERFLOW) -+ d->status = 0; -+ -+ if (++qh->iso_idx >= urb->number_of_packets) -+ done = true; -+ else -+ done = false; -+ -+ } else { - /* done if urb buffer is full or short packet is recd */ - done = (urb->actual_length + xfer_len >= - urb->transfer_buffer_length - || dma->actual_len < qh->maxpacket); -+ } - - /* send IN token for next packet, without AUTOREQ */ - if (!done) { -@@ -1547,7 +1566,8 @@ void musb_host_rx(struct musb *musb, u8 - if (dma) { - struct dma_controller *c; - u16 rx_count; -- int ret; -+ int ret, length; -+ dma_addr_t buf; - - rx_count = musb_readw(epio, MUSB_RXCOUNT); - -@@ -1560,6 +1580,35 @@ void musb_host_rx(struct musb *musb, u8 - - c = musb->dma_controller; - -+ if (usb_pipeisoc(pipe)) { -+ int status = 0; -+ struct usb_iso_packet_descriptor *d; -+ -+ d = urb->iso_frame_desc + qh->iso_idx; -+ -+ if (iso_err) { -+ status = -EILSEQ; -+ urb->error_count++; -+ } -+ if (rx_count > d->length) { -+ if (status == 0) { -+ status = -EOVERFLOW; -+ urb->error_count++; -+ } -+ DBG(2, "** OVERFLOW %d into %d\n",\ -+ rx_count, d->length); -+ -+ length = d->length; -+ } else -+ length = rx_count; -+ d->status = status; -+ buf = urb->transfer_dma + d->offset; -+ } else { -+ length = rx_count; -+ buf = urb->transfer_dma + -+ urb->actual_length; -+ } -+ - dma->desired_mode = 0; - #ifdef USE_MODE1 - /* because of the issue below, mode 1 will -@@ -1571,6 +1620,12 @@ void musb_host_rx(struct musb *musb, u8 - urb->actual_length) - > qh->maxpacket) - dma->desired_mode = 1; -+ if (rx_count < hw_ep->max_packet_sz_rx) { -+ length = rx_count; -+ dma->bDesiredMode = 0; -+ } else { -+ length = urb->transfer_buffer_length; -+ } - #endif - - /* Disadvantage of using mode 1: -@@ -1608,12 +1663,7 @@ void musb_host_rx(struct musb *musb, u8 - */ - ret = c->channel_program( - dma, qh->maxpacket, -- dma->desired_mode, -- urb->transfer_dma -- + urb->actual_length, -- (dma->desired_mode == 0) -- ? rx_count -- : urb->transfer_buffer_length); -+ dma->desired_mode, buf, length); - - if (!ret) { - c->channel_release(dma); -@@ -1631,19 +1681,6 @@ void musb_host_rx(struct musb *musb, u8 - } - } - -- if (dma && usb_pipeisoc(pipe)) { -- struct usb_iso_packet_descriptor *d; -- int iso_stat = status; -- -- d = urb->iso_frame_desc + qh->iso_idx; -- d->actual_length += xfer_len; -- if (iso_err) { -- iso_stat = -EILSEQ; -- urb->error_count++; -- } -- d->status = iso_stat; -- } -- - finish: - urb->actual_length += xfer_len; - qh->offset += xfer_len; diff --git a/usb.current/usb-musb-removes-compilation-warning-in-gadget-mode.patch b/usb.current/usb-musb-removes-compilation-warning-in-gadget-mode.patch deleted file mode 100644 index 4a71e92c2ac860..00000000000000 --- a/usb.current/usb-musb-removes-compilation-warning-in-gadget-mode.patch +++ /dev/null @@ -1,33 +0,0 @@ -From felipe.balbi@nokia.com Fri Oct 31 09:56:48 2008 -From: Felipe Balbi <felipe.balbi@nokia.com> -Date: Wed, 29 Oct 2008 15:10:38 +0200 -Subject: usb: musb: Removes compilation warning in gadget mode -To: linux-usb@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Ajay Kumar Gupta <ajay.gupta@ti.com>, Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1225285839-3085-9-git-send-email-felipe.balbi@nokia.com> - - -From: Ajay Kumar Gupta <ajay.gupta@ti.com> - -Fixes compilation warning when musb is configured in gadget mode. - -Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com> -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/omap2430.c | 2 ++ - 1 file changed, 2 insertions(+) - ---- a/drivers/usb/musb/omap2430.c -+++ b/drivers/usb/musb/omap2430.c -@@ -53,7 +53,9 @@ static void musb_do_idle(unsigned long _ - { - struct musb *musb = (void *)_musb; - unsigned long flags; -+#ifdef CONFIG_USB_MUSB_HDRC_HCD - u8 power; -+#endif - u8 devctl; - - devctl = musb_readb(musb->mregs, MUSB_DEVCTL); diff --git a/usb.current/usb-musb-tusb6010-kill-compile-warning.patch b/usb.current/usb-musb-tusb6010-kill-compile-warning.patch deleted file mode 100644 index c4570833e1490a..00000000000000 --- a/usb.current/usb-musb-tusb6010-kill-compile-warning.patch +++ /dev/null @@ -1,29 +0,0 @@ -From felipe.balbi@nokia.com Fri Oct 31 09:56:07 2008 -From: Felipe Balbi <felipe.balbi@nokia.com> -Date: Wed, 29 Oct 2008 15:10:36 +0200 -Subject: usb: musb: tusb6010: kill compile warning -To: linux-usb@vger.kernel.org -Cc: Greg Kroah-Hartman <gregkh@suse.de>, Felipe Balbi <felipe.balbi@nokia.com> -Message-ID: <1225285839-3085-7-git-send-email-felipe.balbi@nokia.com> - - -Add an errno to failing case. - -Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/musb/tusb6010.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/musb/tusb6010.c -+++ b/drivers/usb/musb/tusb6010.c -@@ -605,7 +605,7 @@ void musb_platform_set_mode(struct musb - - if (musb->board_mode != MUSB_OTG) { - ERR("Changing mode currently only supported in OTG mode\n"); -- return; -+ return -EINVAL; - } - - otg_stat = musb_readl(tbase, TUSB_DEV_OTG_STAT); diff --git a/usb.current/usb-net-asix-add-support-for-cables-to-go-usb-ethernet-adapter.patch b/usb.current/usb-net-asix-add-support-for-cables-to-go-usb-ethernet-adapter.patch deleted file mode 100644 index ebfde01e000efd..00000000000000 --- a/usb.current/usb-net-asix-add-support-for-cables-to-go-usb-ethernet-adapter.patch +++ /dev/null @@ -1,32 +0,0 @@ -From jason@lakedaemon.net Wed Nov 12 15:39:55 2008 -From: Jason Cooper <jason@lakedaemon.net> -Date: Tue, 11 Nov 2008 13:02:53 -0500 -Subject: USB: net: asix: add support for Cables-to-Go USB Ethernet adapter -To: Greg KH <greg@kroah.com> -Cc: <alan@lxorguk.ukuu.org.uk> -Message-ID: <4919C8CD.5020301@lakedaemon.net> - - -Add support to drivers/net/usb/asix.c for the Cables-to-Go "USB 2.0 to -10/100 Ethernet Adapter". USB id 0b95:772a. - -Signed-off-by: Jason Cooper <jason@lakedaemon.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/net/usb/asix.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/drivers/net/usb/asix.c -+++ b/drivers/net/usb/asix.c -@@ -1444,6 +1444,10 @@ static const struct usb_device_id produc - // Apple USB Ethernet Adapter - USB_DEVICE(0x05ac, 0x1402), - .driver_info = (unsigned long) &ax88772_info, -+}, { -+ // Cables-to-Go USB Ethernet Adapter -+ USB_DEVICE(0x0b95, 0x772a), -+ .driver_info = (unsigned long) &ax88772_info, - }, - { }, // END - }; diff --git a/usb.current/usb-r8a66597-hcd-fix-wrong-data-access-in-superh-on-chip-usb.patch b/usb.current/usb-r8a66597-hcd-fix-wrong-data-access-in-superh-on-chip-usb.patch deleted file mode 100644 index d5a67ad0aeba03..00000000000000 --- a/usb.current/usb-r8a66597-hcd-fix-wrong-data-access-in-superh-on-chip-usb.patch +++ /dev/null @@ -1,36 +0,0 @@ -From shimoda.yoshihiro@renesas.com Wed Nov 12 11:51:31 2008 -From: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> -Date: Tue, 11 Nov 2008 16:47:21 +0900 -Subject: usb: r8a66597-hcd: fix wrong data access in SuperH on-chip USB -To: greg@kroah.com -Cc: linux-usb@vger.kernel.org, linux-sh@vger.kernel.org -Message-ID: <49193889.1080700@renesas.com> - - -When I used SuperH on-chip USB, there was the problem that accessed -r8a66597_root_hub which was not allocated. - -Signed-off-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/r8a66597-hcd.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/usb/host/r8a66597-hcd.c -+++ b/drivers/usb/host/r8a66597-hcd.c -@@ -1763,11 +1763,12 @@ static void r8a66597_timer(unsigned long - { - struct r8a66597 *r8a66597 = (struct r8a66597 *)_r8a66597; - unsigned long flags; -+ int port; - - spin_lock_irqsave(&r8a66597->lock, flags); - -- r8a66597_root_hub_control(r8a66597, 0); -- r8a66597_root_hub_control(r8a66597, 1); -+ for (port = 0; port < R8A66597_MAX_ROOT_HUB; port++) -+ r8a66597_root_hub_control(r8a66597, port); - - spin_unlock_irqrestore(&r8a66597->lock, flags); - } diff --git a/usb.current/usb-remove-optional-bus-bindings-in-isp1760-fixing-runtime-warning.patch b/usb.current/usb-remove-optional-bus-bindings-in-isp1760-fixing-runtime-warning.patch deleted file mode 100644 index 63ea5f52c5b90a..00000000000000 --- a/usb.current/usb-remove-optional-bus-bindings-in-isp1760-fixing-runtime-warning.patch +++ /dev/null @@ -1,165 +0,0 @@ -From bigeasy@linutronix.de Wed Nov 12 11:38:19 2008 -From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> -Date: Sun, 2 Nov 2008 15:25:42 +0100 -Subject: USB: remove optional bus bindings in isp1760, fixing runtime warning -To: Greg Kroah-Hartman <gregkh@suse.de> -Cc: Roland Kletzing <devzero@web.de>, Sam Ravnborg <sam@ravnborg.org> -Message-ID: <20081102142542.GA29172@www.tglx.de> -Content-Disposition: inline - - -Roland Reported the following: -| kmem_cache_create: duplicate cache isp1760_qtd -| Pid: 461, comm: modprobe Tainted: G W 2.6.28-rc2-git3-default #4 -| Call Trace: -| [<c017540e>] kmem_cache_create+0xc9/0x3a3 -| [<c0159a8d>] free_pages_bulk+0x16c/0x1c9 -| [<f165c05f>] isp1760_init+0x0/0xb [isp1760] -| [<f165c018>] init_kmem_once+0x18/0x5f [isp1760] -| [<f165c064>] isp1760_init+0x5/0xb [isp1760] -| [<c010113d>] _stext+0x4d/0x148 -| [<c0142936>] load_module+0x12cd/0x142e -| [<c01743c4>] kmem_cache_destroy+0x0/0xd7 -| [<c0142b1e>] sys_init_module+0x87/0x176 -| [<c01039eb>] sysenter_do_call+0x12/0x2f - -The reason, is that ret is initialized with ENODEV instead of 0 _or_ -the kmem cache is not freed in error case with no bus binding. - -The difference between OF+PCI and OF only is -| 15148 804 32 15984 3e70 isp1760-of-pci.o -| 13748 676 8 14432 3860 isp1760-of.o - -about 1.5 KiB. - -Until there is a checkbox where the user *must* select atleast one item, -and may select multiple entries I don't make it selectable anymore. -Having a driver which can't be used under any circumstances is broken -anyway and I've seen distros shipping it that way. - -Reported-by: Roland Kletzing <devzero@web.de> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>a -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/Kconfig | 23 ++++++----------------- - drivers/usb/host/isp1760-if.c | 22 +++++++++++----------- - 2 files changed, 17 insertions(+), 28 deletions(-) - ---- a/drivers/usb/host/isp1760-if.c -+++ b/drivers/usb/host/isp1760-if.c -@@ -14,16 +14,16 @@ - #include "../core/hcd.h" - #include "isp1760-hcd.h" - --#ifdef CONFIG_USB_ISP1760_OF -+#ifdef CONFIG_PPC_OF - #include <linux/of.h> - #include <linux/of_platform.h> - #endif - --#ifdef CONFIG_USB_ISP1760_PCI -+#ifdef CONFIG_PCI - #include <linux/pci.h> - #endif - --#ifdef CONFIG_USB_ISP1760_OF -+#ifdef CONFIG_PPC_OF - static int of_isp1760_probe(struct of_device *dev, - const struct of_device_id *match) - { -@@ -128,7 +128,7 @@ static struct of_platform_driver isp1760 - }; - #endif - --#ifdef CONFIG_USB_ISP1760_PCI -+#ifdef CONFIG_PCI - static u32 nxp_pci_io_base; - static u32 iolength; - static u32 pci_mem_phy0; -@@ -288,28 +288,28 @@ static struct pci_driver isp1761_pci_dri - - static int __init isp1760_init(void) - { -- int ret = -ENODEV; -+ int ret; - - init_kmem_once(); - --#ifdef CONFIG_USB_ISP1760_OF -+#ifdef CONFIG_PPC_OF - ret = of_register_platform_driver(&isp1760_of_driver); - if (ret) { - deinit_kmem_cache(); - return ret; - } - #endif --#ifdef CONFIG_USB_ISP1760_PCI -+#ifdef CONFIG_PCI - ret = pci_register_driver(&isp1761_pci_driver); - if (ret) - goto unreg_of; - #endif - return ret; - --#ifdef CONFIG_USB_ISP1760_PCI -+#ifdef CONFIG_PCI - unreg_of: - #endif --#ifdef CONFIG_USB_ISP1760_OF -+#ifdef CONFIG_PPC_OF - of_unregister_platform_driver(&isp1760_of_driver); - #endif - deinit_kmem_cache(); -@@ -319,10 +319,10 @@ module_init(isp1760_init); - - static void __exit isp1760_exit(void) - { --#ifdef CONFIG_USB_ISP1760_OF -+#ifdef CONFIG_PPC_OF - of_unregister_platform_driver(&isp1760_of_driver); - #endif --#ifdef CONFIG_USB_ISP1760_PCI -+#ifdef CONFIG_PCI - pci_unregister_driver(&isp1761_pci_driver); - #endif - deinit_kmem_cache(); ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -110,29 +110,18 @@ config USB_ISP116X_HCD - - config USB_ISP1760_HCD - tristate "ISP 1760 HCD support" -- depends on USB && EXPERIMENTAL -+ depends on USB && EXPERIMENTAL && (PCI || PPC_OF) - ---help--- - The ISP1760 chip is a USB 2.0 host controller. - - This driver does not support isochronous transfers or OTG. -+ This USB controller is usually attached to a non-DMA-Master -+ capable bus. NXP's eval kit brings this chip on PCI card -+ where the chip itself is behind a PLB to simulate such -+ a bus. - - To compile this driver as a module, choose M here: the -- module will be called isp1760-hcd. -- --config USB_ISP1760_PCI -- bool "Support for the PCI bus" -- depends on USB_ISP1760_HCD && PCI -- ---help--- -- Enables support for the device present on the PCI bus. -- This should only be required if you happen to have the eval kit from -- NXP and you are going to test it. -- --config USB_ISP1760_OF -- bool "Support for the OF platform bus" -- depends on USB_ISP1760_HCD && PPC_OF -- ---help--- -- Enables support for the device present on the PowerPC -- OpenFirmware platform bus. -+ module will be called isp1760. - - config USB_OHCI_HCD - tristate "OHCI HCD support" diff --git a/usb.current/usb-sisusb2vga-driver-add-0x0711-0x0903.patch b/usb.current/usb-sisusb2vga-driver-add-0x0711-0x0903.patch deleted file mode 100644 index db42aee4ac650b..00000000000000 --- a/usb.current/usb-sisusb2vga-driver-add-0x0711-0x0903.patch +++ /dev/null @@ -1,32 +0,0 @@ -From akpm@linux-foundation.org Wed Nov 12 11:42:45 2008 -From: Albert Comerma <albert@ecm.ub.es> -Date: Tue, 04 Nov 2008 10:44:01 -0800 -Subject: USB: SISUSB2VGA driver: add 0x0711, 0x0903 -To: mm-commits@vger.kernel.org -Cc: albert@ecm.ub.es, alan@lxorguk.ukuu.org.uk, albert.comerma@gmail.com, david-b@pacbell.net, greg@kroah.com, mchehab@infradead.org -Message-ID: <200811041844.mA4Ii14X028631@imap1.linux-foundation.org> - - -From: Albert Comerma <albert@ecm.ub.es> - -Signed-off-by: Albert Comerma <albert.comerma@gmail.com> -Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> -Cc: David Brownell <david-b@pacbell.net> -Cc: Mauro Carvalho Chehab <mchehab@infradead.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/misc/sisusbvga/sisusb.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/usb/misc/sisusbvga/sisusb.c -+++ b/drivers/usb/misc/sisusbvga/sisusb.c -@@ -3270,6 +3270,7 @@ static struct usb_device_id sisusb_table - { USB_DEVICE(0x0711, 0x0900) }, - { USB_DEVICE(0x0711, 0x0901) }, - { USB_DEVICE(0x0711, 0x0902) }, -+ { USB_DEVICE(0x0711, 0x0903) }, - { USB_DEVICE(0x0711, 0x0918) }, - { USB_DEVICE(0x182d, 0x021c) }, - { USB_DEVICE(0x182d, 0x0269) }, diff --git a/usb.current/usb-storage-adjust-comment-in-kconfig.patch b/usb.current/usb-storage-adjust-comment-in-kconfig.patch deleted file mode 100644 index da42a010c51f37..00000000000000 --- a/usb.current/usb-storage-adjust-comment-in-kconfig.patch +++ /dev/null @@ -1,36 +0,0 @@ -From mdharm-usb@one-eyed-alien.net Wed Nov 12 11:30:16 2008 -From: Paul Bolle <pebolle@tiscali.nl> -Date: Thu, 30 Oct 2008 08:42:43 -0700 -Subject: USB: storage: adjust comment in Kconfig -To: Linux USB <linux-usb@vger.kernel.org>, Greg KH <greg@kroah.com>, USB Storage List <usb-storage@lists.one-eyed-alien.net> -Message-ID: <20081030154243.GA16166@one-eyed-alien.net> -Content-Disposition: inline - - -From: Paul Bolle <pebolle@tiscali.nl> - -Since commit 65934a9 ("Make USB storage depend on SCSI rather than selecting -it [try #6]") the comment at the top of drivers/usb/storage/Kconfig is -incorrect. Adjust it to the current situation. - -Signed-off-by: Paul Bolle <pebolle@tiscali.nl> -Signed-off-by: Matthew Dharm <mdharm-usb@one-eyed-alien.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/Kconfig | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/usb/storage/Kconfig -+++ b/drivers/usb/storage/Kconfig -@@ -2,8 +2,8 @@ - # USB Storage driver configuration - # - --comment "NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support'" --comment "may also be needed; see USB_STORAGE Help for more information" -+comment "NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed;" -+comment "see USB_STORAGE Help for more information" - depends on USB - - config USB_STORAGE diff --git a/usb.current/usb-unusual-devs-patch-for-nokia-7610-supernova.patch b/usb.current/usb-unusual-devs-patch-for-nokia-7610-supernova.patch deleted file mode 100644 index 65f9d123541a34..00000000000000 --- a/usb.current/usb-unusual-devs-patch-for-nokia-7610-supernova.patch +++ /dev/null @@ -1,39 +0,0 @@ -From evilbladewarrior@gmail.com Wed Nov 12 11:40:02 2008 -From: Ricky Wong <evilbladewarrior@gmail.com> -Date: Tue, 04 Nov 2008 19:13:45 +0800 -Subject: usb: unusual devs patch for Nokia 7610 Supernova -To: phil@ipom.com -Cc: linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net -Message-ID: <1225797225.19168.24.camel@ricky-desktop> - -From: Ricky Wong <evilbladewarrior@gmail.com> - -Additional sectors were reported by the Nokia 7610 Supernova phone in -usb storage mode. The following patch rectifies the aforementioned -problem. - -Signed-off-by: Ricky Wong Yung Fei <evilbladewarrior@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - ---- - drivers/usb/storage/unusual_devs.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -253,6 +253,14 @@ UNUSUAL_DEV( 0x0421, 0x006a, 0x0000, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY ), - -+/* Submitted by Ricky Wong Yung Fei <evilbladewarrior@gmail.com> */ -+/* Nokia 7610 Supernova - Too many sectors reported in usb storage mode */ -+UNUSUAL_DEV( 0x0421, 0x00f5, 0x0000, 0x0470, -+ "Nokia", -+ "7610 Supernova", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY ), -+ - /* Reported by Olaf Hering <olh@suse.de> from novell bug #105878 */ - UNUSUAL_DEV( 0x0424, 0x0fdc, 0x0210, 0x0210, - "SMSC", diff --git a/usb.current/usb-unusual_devs-entry-for-argosy-usb-mass-storage-interface.patch b/usb.current/usb-unusual_devs-entry-for-argosy-usb-mass-storage-interface.patch deleted file mode 100644 index f8d9da83908d13..00000000000000 --- a/usb.current/usb-unusual_devs-entry-for-argosy-usb-mass-storage-interface.patch +++ /dev/null @@ -1,37 +0,0 @@ -From stern@rowland.harvard.edu Wed Nov 12 09:28:37 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Tue, 4 Nov 2008 11:33:35 -0500 (EST) -Subject: USB: unusual_devs entry for Argosy USB mass-storage interface -To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com> -Cc: Luciano Rocha <luciano@eurotux.com>, USB list <linux-usb@vger.kernel.org> -Message-ID: <Pine.LNX.4.44L0.0811041132220.3614-100000@iolanthe.rowland.org> - - -This patch (as1162) adds an unusual_devs entry for Argosy's USB-IDE -interface. This fixes Bugzilla #11843. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Luciano Rocha <luciano@eurotux.com> -Cc: stable <stable@kernel.org> -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 -@@ -1265,6 +1265,13 @@ UNUSUAL_DEV( 0x0839, 0x000a, 0x0001, 0x0 - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_INQUIRY), - -+/* Reported by Luciano Rocha <luciano@eurotux.com> */ -+UNUSUAL_DEV( 0x0840, 0x0082, 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-vstusb-fix-compiler-warning-on-x86-64.patch b/usb.current/usb-vstusb-fix-compiler-warning-on-x86-64.patch deleted file mode 100644 index dd96bfff7c15f6..00000000000000 --- a/usb.current/usb-vstusb-fix-compiler-warning-on-x86-64.patch +++ /dev/null @@ -1,25 +0,0 @@ -From foo@baz Fri Oct 31 10:09:57 PDT 2008 -Date: Fri, 31 Oct 2008 10:09:57 -0700 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: vstusb: fix compiler warning on x86-64 - -This fixes a reported compiler warning. - -Reported-by: Randy Dunlap <randy.dunlap@oracle.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - drivers/usb/misc/vstusb.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/usb/misc/vstusb.c -+++ b/drivers/usb/misc/vstusb.c -@@ -620,7 +620,7 @@ static long vstusb_ioctl(struct file *fi - __func__); - retval = -EFAULT; - } else { -- dev_dbg(&dev->dev, "%s: recv %d bytes from pipe %d\n", -+ dev_dbg(&dev->dev, "%s: recv %zd bytes from pipe %d\n", - __func__, usb_data.count, usb_data.pipe); - } - @@ -1 +1 @@ -2.6.28-rc4-git4 +2.6.28-rc5 |