Revert "usb: typec: ucsi: Fix null pointer dereference in ucsi_sync_control_common"

This reverts commit 14ad4c10d5bdd413ff9a914260e89b5f54b7a2c7.

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: 14ad4c10d5bd ("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>

diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
index 7129973f19e7eb7163a43797ca9f324af6242c4f..9b3df776137a17e569588d41ee437a778342146e 100644 (file)
--- a/drivers/usb/typec/ucsi/ucsi.c
+++ b/drivers/usb/typec/ucsi/ucsi.c
@@ -97,7 +97,7 @@ out_clear_bit:
        if (!ret && cci)
                ret = ucsi->ops->read_cci(ucsi, cci);
 
-       if (!ret && cci && ucsi->message_in_size > 0 &&
+       if (!ret && ucsi->message_in_size > 0 &&
            (*cci & UCSI_CCI_COMMAND_COMPLETE))
                ret = ucsi->ops->read_message_in(ucsi, ucsi->message_in,
                                                 ucsi->message_in_size);