diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-28 14:11:22 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-28 14:11:22 -0800 |
| commit | b5840ac9815f6645a90e4a1df539ae844a59d8e4 (patch) | |
| tree | b210c298cea51fb43b45d02b9d1f4c980a0c91fe /usb | |
| parent | d579e611fabba57018fe62ae1f62e7807604a069 (diff) | |
| download | patches-b5840ac9815f6645a90e4a1df539ae844a59d8e4.tar.gz | |
usb patches updated
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-ehci-add-separate-iaa-watchdog-timer.patch | 2 | ||||
| -rw-r--r-- | usb/usb-handle-idvendor-of-0x0000.patch | 22 | ||||
| -rw-r--r-- | usb/usb-ohci-sm501-driver.patch | 2 |
3 files changed, 22 insertions, 4 deletions
diff --git a/usb/usb-ehci-add-separate-iaa-watchdog-timer.patch b/usb/usb-ehci-add-separate-iaa-watchdog-timer.patch index fb4c520791b5b2..ad0bbfdca48ef5 100644 --- a/usb/usb-ehci-add-separate-iaa-watchdog-timer.patch +++ b/usb/usb-ehci-add-separate-iaa-watchdog-timer.patch @@ -78,7 +78,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - /* lost IAA irqs wedge things badly; seen with a vt8235 */ + status = ehci_readl(ehci, &ehci->regs->status); + cmd = ehci_readl(ehci, &ehci->regs->command); -+ ehci_info(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd); ++ ehci_dbg(ehci, "IAA watchdog: status %x cmd %x\n", status, cmd); + + /* lost IAA irqs wedge things badly; seen first with a vt8235 */ if (ehci->reclaim) { diff --git a/usb/usb-handle-idvendor-of-0x0000.patch b/usb/usb-handle-idvendor-of-0x0000.patch index aa585ae108129b..f6b26acab7a91e 100644 --- a/usb/usb-handle-idvendor-of-0x0000.patch +++ b/usb/usb-handle-idvendor-of-0x0000.patch @@ -11,14 +11,32 @@ add a module alias with this id, we just can't do it due to a check in the file2alias.c file. Change the test to verify that both the vendor and product ids are 0x0000 to show a real "blank" module alias. +Note, the module-init-tools package also needs to be changed to properly +generate the depmod tables. + Cc: Janusz <janumix@poczta.fm> Cc: stable <stable@kernel.org> +Cc: Jon Masters <jcm@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - scripts/mod/file2alias.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/usb/core/driver.c | 4 ++-- + scripts/mod/file2alias.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +--- a/drivers/usb/core/driver.c ++++ b/drivers/usb/core/driver.c +@@ -534,8 +534,8 @@ const struct usb_device_id *usb_match_id + id->driver_info is the way to create an entry that + indicates that the driver want to examine every + device and interface. */ +- for (; id->idVendor || id->bDeviceClass || id->bInterfaceClass || +- id->driver_info; id++) { ++ for (; id->idVendor || id->idProduct || id->bDeviceClass || ++ id->bInterfaceClass || id->driver_info; id++) { + if (usb_match_one_id(interface, id)) + return id; + } --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -155,7 +155,7 @@ static void do_usb_entry_multi(struct us diff --git a/usb/usb-ohci-sm501-driver.patch b/usb/usb-ohci-sm501-driver.patch index 1c3774284518b9..cd7db07fc3b9cd 100644 --- a/usb/usb-ohci-sm501-driver.patch +++ b/usb/usb-ohci-sm501-driver.patch @@ -167,7 +167,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + * fine. This is however not always the case - buffers may be allocated + * using kmalloc() - so the usb core needs to be told that it must copy + * data into our local memory if the buffers happen to be placed in -+ * regular memory. The HCD_BOUNCE flag does just that. ++ * regular memory. The HCD_LOCAL_MEM flag does just that. + */ + + if (!dma_declare_coherent_memory(dev, mem->start, |