USB: isp1362: fix pulldown register defines and conf logic

HCHWCFG_PULLDOWN_DS2 and HCHWCFG_PULLDOWN_DS1 were swapped.  Incorrect
operator precedence in isp1362_hc_start() hid part of the problem.
This fixes a problem where Port 1 in Host mode fails to see disconnects.

Signed-Off-By: Ken MacLeod <ken@bitsko.slc.ut.us>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/isp1362-hcd.c b/drivers/usb/host/isp1362-hcd.c
index 5819e10a146cdbe1cd495d5434d3b465b6d24c7f..16ba1eadf9715ea01d95e442914e3e3db771e834 100644 (file)
--- a/drivers/usb/host/isp1362-hcd.c
+++ b/drivers/usb/host/isp1362-hcd.c
@@ -2563,7 +2563,7 @@ static int isp1362_hc_start(struct usb_hcd *hcd)
        hwcfg = HCHWCFG_INT_ENABLE | HCHWCFG_DBWIDTH(1);
        if (board->sel15Kres)
                hwcfg |= HCHWCFG_PULLDOWN_DS2 |
-                       (MAX_ROOT_PORTS > 1) ? HCHWCFG_PULLDOWN_DS1 : 0;
+                       ((MAX_ROOT_PORTS > 1) ? HCHWCFG_PULLDOWN_DS1 : 0);
        if (board->clknotstop)
                hwcfg |= HCHWCFG_CLKNOTSTOP;
        if (board->oc_enable)

diff --git a/drivers/usb/host/isp1362.h b/drivers/usb/host/isp1362.h
index 26e44fc8776fcddb3899df51bbdcfeb0bc761bd9..fe60f62a32f38917c71869017cf37ceccd925390 100644 (file)
--- a/drivers/usb/host/isp1362.h
+++ b/drivers/usb/host/isp1362.h
@@ -161,8 +161,8 @@ ISP1362_REG(HCRHPORT2,      0x16,   REG_WIDTH_32,   REG_ACCESS_RW);
 ISP1362_REG(HCHWCFG,   0x20,   REG_WIDTH_16,   REG_ACCESS_RW);
 #define HCHWCFG_DISABLE_SUSPEND        (1 << 15)
 #define HCHWCFG_GLOBAL_PWRDOWN (1 << 14)
-#define HCHWCFG_PULLDOWN_DS1   (1 << 13)
-#define HCHWCFG_PULLDOWN_DS2   (1 << 12)
+#define HCHWCFG_PULLDOWN_DS2   (1 << 13)
+#define HCHWCFG_PULLDOWN_DS1   (1 << 12)
 #define HCHWCFG_CLKNOTSTOP     (1 << 11)
 #define HCHWCFG_ANALOG_OC      (1 << 10)
 #define HCHWCFG_ONEINT         (1 << 9)