]> www.infradead.org Git - users/hch/misc.git/commitdiff
usb: typec: ucsi: Add check for UCSI version
authorVenkat Jayaraman <venkat.jayaraman@intel.com>
Fri, 5 Sep 2025 18:44:01 +0000 (11:44 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 6 Sep 2025 13:24:10 +0000 (15:24 +0200)
"Power Reading" bit is introduced in UCSI v2.1 and so limit the
check for that bit only if version supported is 2.1 or above.

Fixes: c851b71fd6cd ("usb: typec: ucsi: Add support for READ_POWER_LEVEL command")
Signed-off-by: Venkat Jayaraman <venkat.jayaraman@intel.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250905184401.3222530-1-venkat.jayaraman@intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi.c

index 0d6b0cf5a7cd757e863342142ab9b66b37449aab..3f568f790f39b0271667e80816270274b8dd3008 100644 (file)
@@ -1293,7 +1293,8 @@ static void ucsi_handle_connector_change(struct work_struct *work)
        if (change & UCSI_CONSTAT_BC_CHANGE)
                ucsi_port_psy_changed(con);
 
-       if (UCSI_CONSTAT(con, PWR_READING_READY_V2_1)) {
+       if (con->ucsi->version >= UCSI_VERSION_2_1 &&
+           UCSI_CONSTAT(con, PWR_READING_READY_V2_1)) {
                curr_scale = UCSI_CONSTAT(con, CURRENT_SCALE_V2_1);
                volt_scale = UCSI_CONSTAT(con, VOLTAGE_SCALE_V2_1);