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 B7EEB2253FE; Mon, 10 Mar 2025 17:40:15 +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=1741628415; cv=none; b=QS29QTR85tMNxb+KUeNgtD9T4+b5DABIXYqNXvOc3/56SOU+OpnzUZPLm9fh3lg8rknllZ4tCjpoXmG+wrwzaHy8kBohkrBjiH10MBXnVO0o/Vxg49LUYzFifjK/z+Y2HnKDOChUm5hpikMpS+bwLMqsc4uAgtmdaadp3D+GowQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741628415; c=relaxed/simple; bh=+atGtYdIhw/LanobS44BRRUknjmt0ZEDeEaBP1TGJb8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MMiUPklUBOlkngkGvBvMeFTn2vyPva3SpTiCeFUhUZKPA9jyDUdj0WBt5ELD2ll2DlCEos6GOQeIPGKXkSIn+76cq2KbAxJ6ETRFpLKZC4Uo40SY96n/9DoRXJ4Ee0iL/hpxPpgCRzkokuHs0OvX30krKiSxOjV6ec+QPg2Dvs8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=IDXSwJug; 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="IDXSwJug" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DA4CEC4CEE5; Mon, 10 Mar 2025 17:40:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741628415; bh=+atGtYdIhw/LanobS44BRRUknjmt0ZEDeEaBP1TGJb8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IDXSwJugdk7rsg231T7Kl17783pC1VD5QM6VKCRnXhcDNT2Fg7Um2OGwkysLLsPqU RbxDqADxridcj3q+GnMuAbXUMSwTMZbsN1Tjk9/8kiWwEgyhG/+CE4Q18AD2Zlv8y/ ihbAhCl8sTTJ7csfUE1X076zb/g+vJJcDJGY1ICw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Xinghuo Chen , Guenter Roeck , Sasha Levin Subject: [PATCH 6.1 049/109] hwmon: fix a NULL vs IS_ERR_OR_NULL() check in xgene_hwmon_probe() Date: Mon, 10 Mar 2025 18:06:33 +0100 Message-ID: <20250310170429.517280442@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170427.529761261@linuxfoundation.org> References: <20250310170427.529761261@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Xinghuo Chen [ Upstream commit 10fce7ebe888fa8c97eee7e317a47e7603e5e78d ] The devm_memremap() function returns error pointers on error, it doesn't return NULL. Fixes: c7cefce03e69 ("hwmon: (xgene) access mailbox as RAM") Signed-off-by: Xinghuo Chen Link: https://lore.kernel.org/r/tencent_9AD8E7683EC29CAC97496B44F3F865BA070A@qq.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/xgene-hwmon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index 78d9f52e2a719..207084d55044a 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c @@ -712,7 +712,7 @@ static int xgene_hwmon_probe(struct platform_device *pdev) goto out; } - if (!ctx->pcc_comm_addr) { + if (IS_ERR_OR_NULL(ctx->pcc_comm_addr)) { dev_err(&pdev->dev, "Failed to ioremap PCC comm region\n"); rc = -ENOMEM; -- 2.39.5