USB: ohci: make distrust_firmware a quirk

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

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)
         int ret;
         struct usb_hcd *hcd = ohci_to_hcd(ohci);
 
+        if (distrust_firmware)
+                ohci->flags |= OHCI_QUIRK_HUB_POWER;
+
         disable (ohci);
         ohci->regs = hcd->regs;
 
@@ -689,7 +692,8 @@ retry:
                 temp |= RH_A_NOCP;
                 temp &= ~(RH_A_POTPGT | RH_A_NPS);
                 ohci_writel (ohci, temp, &ohci->regs->roothub.a);
-        } else if ((ohci->flags & OHCI_QUIRK_AMD756) || distrust_firmware) {
+        } else if ((ohci->flags & OHCI_QUIRK_AMD756) ||
+                        (ohci->flags & OHCI_QUIRK_HUB_POWER)) {
                 /* hub power always on; required for AMD-756 and some
                  * Mac platforms.  ganged overcurrent reporting, if any.
                  */