Merge branch 'core/percpu' into x86/paravirt

[linux-2.6-omap-h63xx.git] / drivers / usb / host / isp1760-hcd.c

diff --git a/drivers/usb/host/isp1760-hcd.c b/drivers/usb/host/isp1760-hcd.c
index 8017f1cf78e244b0f37c4a32d2833de3d2d2a586..b899f1a59c262fd322b5b44caace1f8d6948b5ac 100644 (file)
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
@@ -435,14 +435,13 @@ static int isp1760_hc_setup(struct usb_hcd *hcd)
 
        /*
         * PORT 1 Control register of the ISP1760 is the OTG control
-        * register on ISP1761.
+        * register on ISP1761. Since there is no OTG or device controller
+        * support in this driver, we use port 1 as a "normal" USB host port on
+        * both chips.
         */
-       if (!(priv->devflags & ISP1760_FLAG_ISP1761) &&
-           !(priv->devflags & ISP1760_FLAG_PORT1_DIS)) {
-               isp1760_writel(PORT1_POWER | PORT1_INIT2,
-                              hcd->regs + HC_PORT1_CTRL);
-               mdelay(10);
-       }
+       isp1760_writel(PORT1_POWER | PORT1_INIT2,
+                      hcd->regs + HC_PORT1_CTRL);
+       mdelay(10);
 
        priv->hcs_params = isp1760_readl(hcd->regs + HC_HCSPARAMS);