]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
ucsi_ccg: Don't show failed to get FW build information error
authorMario Limonciello <mario.limonciello@amd.com>
Fri, 21 Feb 2025 05:40:03 +0000 (23:40 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Mar 2025 09:24:24 +0000 (10:24 +0100)
The error `failed to get FW build information` is added for what looks
to be for misdetection of the device property firmware-name.

If the property is missing (such as on non-nvidia HW) this error shows up.
Move the error into the scope of the property parser for "firmware-name"
to avoid showing errors on systems without the firmware-name property.

Fixes: 5c9ae5a87573d ("usb: typec: ucsi: ccg: add firmware flashing support")
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20250221054137.1631765-2-superm1@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/ucsi/ucsi_ccg.c

index 47498ee6cca89a9cc3fee872703b8d27487ea7ae..3c4dcc3fa7cf73e7e6b5ba604accc4c8b1ac31b6 100644 (file)
@@ -1429,11 +1429,10 @@ static int ucsi_ccg_probe(struct i2c_client *client)
                        uc->fw_build = CCG_FW_BUILD_NVIDIA_TEGRA;
                else if (!strcmp(fw_name, "nvidia,gpu"))
                        uc->fw_build = CCG_FW_BUILD_NVIDIA;
+               if (!uc->fw_build)
+                       dev_err(uc->dev, "failed to get FW build information\n");
        }
 
-       if (!uc->fw_build)
-               dev_err(uc->dev, "failed to get FW build information\n");
-
        /* reset ccg device and initialize ucsi */
        status = ucsi_ccg_init(uc);
        if (status < 0) {