aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/ohci-hcd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/host/ohci-hcd.c')
-rw-r--r--drivers/usb/host/ohci-hcd.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c
index 26bc47941d01..96fe76e9a6c4 100644
--- a/drivers/usb/host/ohci-hcd.c
+++ b/drivers/usb/host/ohci-hcd.c
@@ -483,6 +483,9 @@ static int ohci_init (struct ohci_hcd *ohci)
483 int ret; 483 int ret;
484 struct usb_hcd *hcd = ohci_to_hcd(ohci); 484 struct usb_hcd *hcd = ohci_to_hcd(ohci);
485 485
486 if (distrust_firmware)
487 ohci->flags |= OHCI_QUIRK_HUB_POWER;
488
486 disable (ohci); 489 disable (ohci);
487 ohci->regs = hcd->regs; 490 ohci->regs = hcd->regs;
488 491
@@ -689,7 +692,8 @@ retry:
689 temp |= RH_A_NOCP; 692 temp |= RH_A_NOCP;
690 temp &= ~(RH_A_POTPGT | RH_A_NPS); 693 temp &= ~(RH_A_POTPGT | RH_A_NPS);
691 ohci_writel (ohci, temp, &ohci->regs->roothub.a); 694 ohci_writel (ohci, temp, &ohci->regs->roothub.a);
692 } else if ((ohci->flags & OHCI_QUIRK_AMD756) || distrust_firmware) { 695 } else if ((ohci->flags & OHCI_QUIRK_AMD756) ||
696 (ohci->flags & OHCI_QUIRK_HUB_POWER)) {
693 /* hub power always on; required for AMD-756 and some 697 /* hub power always on; required for AMD-756 and some
694 * Mac platforms. ganged overcurrent reporting, if any. 698 * Mac platforms. ganged overcurrent reporting, if any.
695 */ 699 */