diff options
| author | Ricardo Martins <rasm@fe.up.pt> | 2012-05-22 18:02:03 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-06-19 23:18:27 +0100 |
| commit | 4dd27dc995567bd95a33956264cc987e03ecc7f9 (patch) | |
| tree | f1687e86c8afa492e8f1bd23a46ff1c9feab17d5 /drivers/usb/host/ehci-hcd.c | |
| parent | 5f081af6cbb83e72194ad3a82623ca42eeb0e662 (diff) | |
| download | kernel_samsung_smdk4412-4dd27dc995567bd95a33956264cc987e03ecc7f9.zip kernel_samsung_smdk4412-4dd27dc995567bd95a33956264cc987e03ecc7f9.tar.gz kernel_samsung_smdk4412-4dd27dc995567bd95a33956264cc987e03ecc7f9.tar.bz2 | |
USB: fix PS3 EHCI systems
commit 4f7a67e2dd49fbfba002c453bc24bf00e701cc71 upstream.
After commit aaa0ef289afe9186f81e2340114ea413eef0492a "PS3 EHCI QH
read work-around", Terratec Grabby (em28xx) stopped working with AMD
Geode LX 800 (USB controller AMD CS5536). Since this is a PS3 only
fix, the following patch adds a conditional block around it.
Signed-off-by: Ricardo Martins <rasm@fe.up.pt>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 64c0d7b..339be10 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -620,7 +620,9 @@ static int ehci_init(struct usb_hcd *hcd) hw = ehci->async->hw; hw->hw_next = QH_NEXT(ehci, ehci->async->qh_dma); hw->hw_info1 = cpu_to_hc32(ehci, QH_HEAD); +#if defined(CONFIG_PPC_PS3) hw->hw_info1 |= cpu_to_hc32(ehci, (1 << 7)); /* I = 1 */ +#endif hw->hw_token = cpu_to_hc32(ehci, QTD_STS_HALT); hw->hw_qtd_next = EHCI_LIST_END(ehci); ehci->async->qh_state = QH_STATE_LINKED; |