From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15AB32686B1; Tue, 8 Apr 2025 11:27:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111655; cv=none; b=hxI/kLdXkoXXEpnKtnbjzKj7sHsZJ73QH2jo4XmEkTOi/f8599BHGeRBQTIz2yV0w5AchHXXZqIHT4Bpqy7rQt4xWk4NeoEdoFbmpz4Xh6GGIZjM3Kl6LTrPbPMg5pLAICZyXmw4KyiUSAmG6mJBSM1ifqCFtWH58lLGC+LdGLI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744111655; c=relaxed/simple; bh=uxL9P2F0opw+WLn431UkGdao43H8s7uqenOo3mCmn1o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LL92Fs2vBPkS1S+pz2rRKkfjjG632wSCd/8n25qaeuX2UkwH2nwAaKAZNMAePAU+jKcbdfgsrFY5MxLPFWPxQHz2k5qMHRqTNiq/qGQNEUsWkZwDjTFtAb13ivjC+SS9UBprE32g1K3UPWsRk+eZq9JagMSj++BNq0K97eD5EWs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ZIhnBjkd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ZIhnBjkd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9563BC4CEEA; Tue, 8 Apr 2025 11:27:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1744111655; bh=uxL9P2F0opw+WLn431UkGdao43H8s7uqenOo3mCmn1o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZIhnBjkd+aTaWvQK8L+NRQh0pTbj2aI9U4bhKVsMRF4cB/Dx9wQz/XXQXtlSa04+s QUcSR9qEzSiYwhaWAdWXVbcx3go6gEDTfdyOXKDJ5jOHMbC0JC0rCoKm/BSlDUsCoM PX61jBKmkYGjG0C498LJv78IH3x5t1W9eL/u+LEc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mario Limonciello , Heikki Krogerus , Sasha Levin Subject: [PATCH 6.14 470/731] ucsi_ccg: Dont show failed to get FW build information error Date: Tue, 8 Apr 2025 12:46:07 +0200 Message-ID: <20250408104925.210562754@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250408104914.247897328@linuxfoundation.org> References: <20250408104914.247897328@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mario Limonciello [ Upstream commit c16006852732dc4fe37c14b81f9b4458df05b832 ] 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 Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20250221054137.1631765-2-superm1@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/ucsi/ucsi_ccg.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi_ccg.c b/drivers/usb/typec/ucsi/ucsi_ccg.c index 4b1668733a4be..511dd1b224ae5 100644 --- a/drivers/usb/typec/ucsi/ucsi_ccg.c +++ b/drivers/usb/typec/ucsi/ucsi_ccg.c @@ -1433,11 +1433,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) { -- 2.39.5