From 0078625fa0e46c56f6e89d69df2dc84411370d60 Mon Sep 17 00:00:00 2001
From: Aric Blumer <aric@sdgsystems.com>
Date: Thu, 30 Jul 2009 13:26:58 -0400
Subject: [PATCH] --- yaml --- r: 164988 b: refs/heads/master c:
 7b4361f0848193ddc36dfb2c9a7391c56a9df2ad h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/host/ohci-pxa27x.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 138aadf821e3..c374ad5d7893 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e23ec4ff2f2181c22ea02cf3774b882acef27e0
+refs/heads/master: 7b4361f0848193ddc36dfb2c9a7391c56a9df2ad
diff --git a/trunk/drivers/usb/host/ohci-pxa27x.c b/trunk/drivers/usb/host/ohci-pxa27x.c
index e44dc2cbca24..b5294a9344de 100644
--- a/trunk/drivers/usb/host/ohci-pxa27x.c
+++ b/trunk/drivers/usb/host/ohci-pxa27x.c
@@ -177,9 +177,13 @@ static inline void pxa27x_setup_hc(struct pxa27x_ohci *ohci,
 
 	if (inf->flags & NO_OC_PROTECTION)
 		uhcrhda |= UHCRHDA_NOCP;
+	else
+		uhcrhda &= ~UHCRHDA_NOCP;
 
 	if (inf->flags & OC_MODE_PERPORT)
 		uhcrhda |= UHCRHDA_OCPM;
+	else
+		uhcrhda &= ~UHCRHDA_OCPM;
 
 	if (inf->power_on_delay) {
 		uhcrhda &= ~UHCRHDA_POTPGT(0xff);