Skip to content

Commit 8b2eb28

Browse files
Andrei Kuchynskijfvogel
authored andcommitted
usb: typec: ucsi: displayport: Fix NULL pointer access
commit 312d796 upstream. This patch ensures that the UCSI driver waits for all pending tasks in the ucsi_displayport_work workqueue to finish executing before proceeding with the partner removal. Cc: stable <[email protected]> Fixes: af8622f ("usb: typec: ucsi: Support for DisplayPort alt mode") Signed-off-by: Andrei Kuchynski <[email protected]> Reviewed-by: Heikki Krogerus <[email protected]> Reviewed-by: Benson Leung <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit 5ad298d6d4aebe1229adba6427e417e89a5208d8) Signed-off-by: Jack Vogel <[email protected]>
1 parent f44078f commit 8b2eb28

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

drivers/usb/typec/ucsi/displayport.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,8 @@ void ucsi_displayport_remove_partner(struct typec_altmode *alt)
296296
if (!dp)
297297
return;
298298

299+
cancel_work_sync(&dp->work);
300+
299301
dp->data.conf = 0;
300302
dp->data.status = 0;
301303
dp->initialized = false;

0 commit comments

Comments
 (0)