diff --git a/[refs] b/[refs] index 046ffab6b792..7c1004affcd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e792b1b0b83c276ca786b01cad662dc2e5d18843 +refs/heads/master: 7949f4e16456183bae0bc19ffe92072a27d0553e diff --git a/trunk/drivers/usb/host/isp1362-hcd.c b/trunk/drivers/usb/host/isp1362-hcd.c index 5819e10a146c..16ba1eadf971 100644 --- a/trunk/drivers/usb/host/isp1362-hcd.c +++ b/trunk/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/trunk/drivers/usb/host/isp1362.h b/trunk/drivers/usb/host/isp1362.h index 26e44fc8776f..fe60f62a32f3 100644 --- a/trunk/drivers/usb/host/isp1362.h +++ b/trunk/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)