usb: typec: tcpm: Fix error while calculating PPS out values

"usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply"
introduced a regression for req_out_volt and req_op_curr calculation.

req_out_volt should consider the newly calculated max voltage instead
of previously accepted max voltage by the port partner. Likewise,
req_op_curr should consider the newly calculated max current instead
of previously accepted max current by the port partner.

Fixes: e3a072022487 ("usb: typec: tcpm: Address incorrect values of tcpm psy for pps supply")
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Badhri Jagan Sridharan <badhri@google.com>
Link: https://lore.kernel.org/r/20210415050121.1928298-1-badhri@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 2ad5e14a6867e56f6507886b9fc99fd63d996aeb..c4fdc00a3bc8f543a85c06d3874895419fb1a9f6 100644 (file)
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -3138,10 +3138,10 @@ static unsigned int tcpm_pd_select_pps_apdo(struct tcpm_port *port)
                port->pps_data.req_max_volt = min(pdo_pps_apdo_max_voltage(src),
                                                  pdo_pps_apdo_max_voltage(snk));
                port->pps_data.req_max_curr = min_pps_apdo_current(src, snk);
-               port->pps_data.req_out_volt = min(port->pps_data.max_volt,
-                                                 max(port->pps_data.min_volt,
+               port->pps_data.req_out_volt = min(port->pps_data.req_max_volt,
+                                                 max(port->pps_data.req_min_volt,
                                                      port->pps_data.req_out_volt));
-               port->pps_data.req_op_curr = min(port->pps_data.max_curr,
+               port->pps_data.req_op_curr = min(port->pps_data.req_max_curr,
                                                 port->pps_data.req_op_curr);
        }