diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-04-25 15:15:38 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-04-25 21:04:41 -0700 |
| commit | 539e261d720e8851a64e2d95bbc5f5883718a193 (patch) | |
| tree | 982840d2e2b324a6586966c42334fc75100cece8 | |
| parent | dd5bea954bd67770a80ef66ed16602da23412adc (diff) | |
| download | chrome-ec-539e261d720e8851a64e2d95bbc5f5883718a193.tar.gz | |
pd: Fix port enable check for low power idle
BUG=chrome-os-partner:52734
BRANCH=glados
TEST=Plug 2 PD chargers on sentry, remove the first, verify that
SLEEP_MASK_USB_PD is not briefly cleared.
Change-Id: I62309194d8b5a694487282434fc63b5f39301ba3
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/340564
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
| -rw-r--r-- | common/usb_pd_tcpc.c | 2 | ||||
| -rw-r--r-- | driver/tcpm/it83xx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/usb_pd_tcpc.c b/common/usb_pd_tcpc.c index a7ed832a0c..8e6b9dda5e 100644 --- a/common/usb_pd_tcpc.c +++ b/common/usb_pd_tcpc.c @@ -1022,7 +1022,7 @@ int tcpc_set_rx_enable(int port, int enable) #if defined(CONFIG_LOW_POWER_IDLE) && !defined(CONFIG_USB_POWER_DELIVERY) /* If any PD port is connected, then disable deep sleep */ for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; ++i) - if (pd[port].rx_enabled) + if (pd[i].rx_enabled) break; if (i == CONFIG_USB_PD_PORT_COUNT) diff --git a/driver/tcpm/it83xx.c b/driver/tcpm/it83xx.c index 4a1257514b..dadfc2393b 100644 --- a/driver/tcpm/it83xx.c +++ b/driver/tcpm/it83xx.c @@ -385,7 +385,7 @@ static int it83xx_tcpm_set_rx_enable(int port, int enable) /* If any PD port is connected, then disable deep sleep */ for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; ++i) - if (IT83XX_USBPD_GCR(port) | USBPD_REG_MASK_BMC_PHY) + if (IT83XX_USBPD_GCR(i) | USBPD_REG_MASK_BMC_PHY) break; if (i == CONFIG_USB_PD_PORT_COUNT) |