On Tue, May 22, 2012 at 5:54 PM, Sergei Shtylyov <sshtylyov@xxxxxxxxxx> wrote: > Hello. > > > On 05/22/2012 08:46 PM, Ricardo Martins wrote: > >> 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@xxxxxxxx> >> >> --- >> diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c >> index 4a3bc5b..bb73df6 100644 >> --- a/drivers/usb/host/ehci-hcd.c >> +++ b/drivers/usb/host/ehci-hcd.c >> @@ -671,7 +671,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; > > > Now unfortunately the patch is white space damaged, i.e. all tabs were > replaced by spaces. It wasn't before. :-) 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@xxxxxxxx> --- diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index 4a3bc5b..bb73df6 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -671,7 +671,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; -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
