From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BE3943FFFA9 for ; Fri, 5 Jun 2026 15:02:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780671780; cv=none; b=CM/I+l68xv+n0etw5jgv7nXnHRWQd1LftsbPF8sLilzq0YgfDlWrDnH2ycjgZyB0T6elO6Roj/U2ps6S+JLT+OkJLryyd7/sWzOYMruNGxbe7aXQLiDK5JqrFHF5aFBurcOVVodww4okS9U3PoZdybasjLZ+pWeVjbADlkEeDBQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780671780; c=relaxed/simple; bh=B5rp3ONQS1xeqsr/kFnR3InSEI0mHjyNFBiOZuiNDds=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=gzufgll3irvRF9aIwduVTrZUWI3/tdmtBWxun6A/j/X259zXVql8Tt4NkxtRj77QO5djVNBnPSstjQW53IW0NtjzZP4RUI0iUdqEuspLRQeTFF7dhIX4feuuvezKV8IdGCWpGYXu/p5vX9ZoZt1HygJNj4sevBw6DVGld3lp/38= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y9KMXcz3; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Y9KMXcz3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 210CA1F00893; Fri, 5 Jun 2026 15:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780671779; bh=gi09YHFOT0+XXeccKg544mRvDDInAoA7EQIaQL0e3jM=; h=Subject:To:Cc:From:Date; b=Y9KMXcz3GcIHqW19gMruWNATcdbbJpawvNTbQEHC81t+f4rQQyINZCBg/YpmkfxNs GsqmJ1LqOckgLpUDgQvhULj+e2uGOJMbRlt22aVAdwEUpqu2qNjeDi9P2B4/uhllGA rrxn2YYm2nF4rL16zYYPPmqoaDMFGkfTWoXS2jaQ= Subject: FAILED: patch "[PATCH] usb: typec: ucsi: Don't update power_supply on power role" failed to apply to 6.6-stable tree To: myrrhperiwinkle@qtmlabs.xyz,gregkh@linuxfoundation.org,senozhatsky@chromium.org,stable@kernel.org Cc: From: Date: Fri, 05 Jun 2026 08:02:57 +0200 Message-ID: <2026060557-ethically-perkiness-c7ca@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.6.y git checkout FETCH_HEAD git cherry-pick -x d98d413ca65d0790a8f3695d0a5845538958ab84 # git commit -s git send-email --to '' --in-reply-to '2026060557-ethically-perkiness-c7ca@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001 From: Myrrh Periwinkle Date: Tue, 19 May 2026 18:41:40 +0700 Subject: [PATCH] usb: typec: ucsi: Don't update power_supply on power role change if not connected 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 Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change") Signed-off-by: Myrrh Periwinkle Reported-and-tested-by: Sergey Senozhatsky Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-2-6f1239535187@qtmlabs.xyz Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 53c101bd48e2..61cb24ed820f 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -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))