diff options
| author | Adam Thomson | 2018-09-21 17:04:11 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-10-02 21:05:30 +0200 |
| commit | 1b6af2f58c2b1522e0804b150ca95e50a9e80ea7 (patch) | |
| tree | 650d9bfe23eaeb90d953ab6a45918f19b95ca618 /drivers/usb/typec/tcpm/tcpm.c | |
| parent | usbip: fix vhci_hcd controller counting (diff) | |
| download | kernel-qcow2-linux-1b6af2f58c2b1522e0804b150ca95e50a9e80ea7.tar.gz kernel-qcow2-linux-1b6af2f58c2b1522e0804b150ca95e50a9e80ea7.tar.xz kernel-qcow2-linux-1b6af2f58c2b1522e0804b150ca95e50a9e80ea7.zip | |
usb: typec: tcpm: Fix APDO PPS order checking to be based on voltage
Current code mistakenly checks against max current to determine
order but this should be max voltage. This commit fixes the issue
so order is correctly determined, thus avoiding failure based on
a higher voltage PPS APDO having a lower maximum current output,
which is actually valid.
Fixes: 2eadc33f40d4 ("typec: tcpm: Add core support for sink side PPS")
Cc: <stable@vger.kernel.org>
Signed-off-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/typec/tcpm/tcpm.c')
| -rw-r--r-- | drivers/usb/typec/tcpm/tcpm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 4f1f4215f3d6..c11b3befa87f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -1430,8 +1430,8 @@ static enum pdo_err tcpm_caps_err(struct tcpm_port *port, const u32 *pdo, if (pdo_apdo_type(pdo[i]) != APDO_TYPE_PPS) break; - if (pdo_pps_apdo_max_current(pdo[i]) < - pdo_pps_apdo_max_current(pdo[i - 1])) + if (pdo_pps_apdo_max_voltage(pdo[i]) < + pdo_pps_apdo_max_voltage(pdo[i - 1])) return PDO_ERR_PPS_APDO_NOT_SORTED; else if (pdo_pps_apdo_min_voltage(pdo[i]) == pdo_pps_apdo_min_voltage(pdo[i - 1]) && |