]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
usb: typec: ucsi: Don't update power_supply on power role change if not connected
authorMyrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
Tue, 19 May 2026 11:41:40 +0000 (18:41 +0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 May 2026 14:57:15 +0000 (16:57 +0200)
We only need to update the power_supply on power role change if the port
is connected, because otherwise the online status should be the same for
both cases.

Cc: stable <stable@kernel.org>
Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change")
Signed-off-by: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
Reported-and-tested-by: Sergey Senozhatsky <senozhatsky@chromium.org>
Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi.c

index 53c101bd48e2723b43b4a79d019b8d4046d7ee57..61cb24ed820f8b089983b235a4bf4224f20d6755 100644 (file)
@@ -1308,7 +1308,12 @@ static void ucsi_handle_connector_change(struct work_struct *work)
 
        if ((change & UCSI_CONSTAT_POWER_DIR_CHANGE) && role != prev_role) {
                typec_set_pwr_role(con->port, role);
-               ucsi_port_psy_changed(con);
+
+               /* Some power_supply properties vary depending on the power direction when
+                * connected
+                */
+               if (UCSI_CONSTAT(con, CONNECTED))
+                       ucsi_port_psy_changed(con);
 
                /* Complete pending power role swap */
                if (!completion_done(&con->complete))