summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian A. Ehrhardt <lk@c--e.de>2024-03-20 08:39:22 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-04-03 15:11:56 +0200
commitd4633044ca4aa1db3aa0d50bd6b820b084b6bf2f (patch)
treec2a44cbc39687db90fbbb52a7653fbfc9c0860e1
parent9a103ca280aeb0123508572cc7f6b64a7b6a66da (diff)
downloadlinux-stable-d4633044ca4aa1db3aa0d50bd6b820b084b6bf2f.tar.gz
linux-stable-d4633044ca4aa1db3aa0d50bd6b820b084b6bf2f.tar.bz2
linux-stable-d4633044ca4aa1db3aa0d50bd6b820b084b6bf2f.zip
usb: typec: ucsi: Clear EVENT_PENDING under PPM lock
commit 15b2e71b4653b3e13df34695a29ebeee237c5af2 upstream. Suppose we sleep on the PPM lock after clearing the EVENT_PENDING bit because the thread for another connector is executing a command. In this case the command completion of the other command will still report the connector change for our connector. Clear the EVENT_PENDING bit under the PPM lock to avoid another useless call to ucsi_handle_connector_change() in this case. Fixes: c9aed03a0a68 ("usb: ucsi: Add missing ppm_lock") Cc: stable <stable@kernel.org> Signed-off-by: Christian A. Ehrhardt <lk@c--e.de> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD Link: https://lore.kernel.org/r/20240320073927.1641788-2-lk@c--e.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/typec/ucsi/ucsi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 8f9dff993b3d..53a8cfe41fc5 100644
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -933,11 +933,11 @@ static void ucsi_handle_connector_change(struct work_struct *work)
if (con->status.change & UCSI_CONSTAT_CAM_CHANGE)
ucsi_partner_task(con, ucsi_check_altmodes, 1, 0);
- clear_bit(EVENT_PENDING, &con->ucsi->flags);
-
mutex_lock(&ucsi->ppm_lock);
+ clear_bit(EVENT_PENDING, &con->ucsi->flags);
ret = ucsi_acknowledge_connector_change(ucsi);
mutex_unlock(&ucsi->ppm_lock);
+
if (ret)
dev_err(ucsi->dev, "%s: ACK failed (%d)", __func__, ret);