Commit 23379a17 authored by Jameson Thies's avatar Jameson Thies Committed by Greg Kroah-Hartman
Browse files

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: af833e7f ("usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarJameson Thies <jthies@google.com>
Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: default avatarKenneth 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4f5ce99

drivers/usb/typec/ucsi/psy.c

+5 −0
Original line number Diff line number Diff line
@@ -145,6 +145,11 @@ static int ucsi_psy_get_current_max(struct ucsi_connector *con, 
{

	u32 pdo;



	if (!UCSI_CONSTAT(con, CONNECTED)) {

		val->intval = 0;

		return 0;

	}



	switch (UCSI_CONSTAT(con, PWR_OPMODE)) {

	case UCSI_CONSTAT_PWR_OPMODE_PD:

		if (con->num_pdos > 0) {