mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 12:57:53 +00:00
usb: typec: tcpm: Fix error while calculating PPS out values
commit374157ff88
upstream. "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:e3a0720224
("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>
This commit is contained in:
parent
5d2f09c44f
commit
6ece86e9e8
1 changed files with 3 additions and 3 deletions
|
@ -2501,10 +2501,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);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue