Skip to content

Commit df3e316

Browse files
committed
Revert "usb: typec: ucsi: Fix null pointer dereference in ucsi_sync_control_common"
This reverts commit 14ad4c1. The originally offending commit will be reverted instead of this fix up at this point in time, so revert this fix. Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com> Cc: Mario Limonciello (AMD) <superm1@kernel.org> Cc: stable <stable@kernel.org> Cc: Johan Hovold <johan@kernel.org> Fixes: 14ad4c1 ("usb: typec: ucsi: Fix null pointer dereference in ucsi_sync_control_common") Link: https://lore.kernel.org/r/20251222152204.2846-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 0dc580d commit df3e316

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/usb/typec/ucsi/ucsi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ int ucsi_sync_control_common(struct ucsi *ucsi, u64 command, u32 *cci)
9797
if (!ret && cci)
9898
ret = ucsi->ops->read_cci(ucsi, cci);
9999

100-
if (!ret && cci && ucsi->message_in_size > 0 &&
100+
if (!ret && ucsi->message_in_size > 0 &&
101101
(*cci & UCSI_CCI_COMMAND_COMPLETE))
102102
ret = ucsi->ops->read_message_in(ucsi, ucsi->message_in,
103103
ucsi->message_in_size);

0 commit comments

Comments
 (0)