drop usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected...

diff --git a/queue-6.12/series b/queue-6.12/series
index c8e22c851e761e5f47b8d289c7406b08fd9972d7..cc035a7133d9c8c759975f0e99727d02e87b62e8 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -220,7 +220,6 @@ usbip-vudc-fix-use-after-free-bug-in-vudc_remove-due-to-race-condition.patch
 usb-usbtmc-check-urb-actual_length-for-interrupt-in-notifications.patch
 usb-usbtmc-reject-interrupt-endpoints-with-small-wmaxpacketsize.patch
 usb-typec-tcpm-improve-handling-of-discover_modes-failures.patch
-usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
 usb-serial-option-add-meig-srm813q.patch
 usb-serial-option-add-missing-rsvd-5-flag-for-rolling-rw135r-gl.patch
 usb-serial-belkin_sa-validate-interrupt-status-length.patch

diff --git a/queue-6.12/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch b/queue-6.12/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
deleted file mode 100644 (file)
index d4bcb2d..0000000
--- a/queue-6.12/usb-typec-ucsi-don-t-update-power_supply-on-power-role-change-if-not-connected.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From d98d413ca65d0790a8f3695d0a5845538958ab84 Mon Sep 17 00:00:00 2001
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-Date: Tue, 19 May 2026 18:41:40 +0700
-Subject: usb: typec: ucsi: Don't update power_supply on power role change if not connected
-
-From: Myrrh Periwinkle <myrrhperiwinkle@qtmlabs.xyz>
-
-commit d98d413ca65d0790a8f3695d0a5845538958ab84 upstream.
-
-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 |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -1231,7 +1231,12 @@ static void ucsi_handle_connector_change
- 
-       if (con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) {
-               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))