Skip to content

Commit 23379a1

Browse files
jthiesatgooglegregkh
authored andcommitted
usb: typec: ucsi: psy: Set max current to zero when disconnected
The ucsi_psy_get_current_max function defaults to 0.1A when it is not clear how much current the partner device can support. But this does not check the port is connected, and will report 0.1A max current when nothing is connected. Update ucsi_psy_get_current_max to report 0A when there is no connection. Fixes: af833e7 ("usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default") Cc: stable@vger.kernel.org Signed-off-by: Jameson Thies <jthies@google.com> Reviewed-by: Benson Leung <bleung@chromium.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Tested-by: Kenneth R. Crudup <kenny@panix.com> Rule: add Link: https://lore.kernel.org/stable/20251017000051.2094101-1-jthies%40google.com Link: https://patch.msgid.link/20251106011446.2052583-1-jthies@google.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e4f5ce9 commit 23379a1

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

  • drivers/usb/typec/ucsi

drivers/usb/typec/ucsi/psy.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ static int ucsi_psy_get_current_max(struct ucsi_connector *con,
145145
{
146146
u32 pdo;
147147

148+
if (!UCSI_CONSTAT(con, CONNECTED)) {
149+
val->intval = 0;
150+
return 0;
151+
}
152+
148153
switch (UCSI_CONSTAT(con, PWR_OPMODE)) {
149154
case UCSI_CONSTAT_PWR_OPMODE_PD:
150155
if (con->num_pdos > 0) {

0 commit comments

Comments
 (0)