Commit ccbd6787 authored by Dan Carpenter's avatar Dan Carpenter Committed by Xiaolong Wang
Browse files

powercap: RAPL: Fix a NULL vs IS_ERR() bug

mainline inclusion
from mainline-v6.5-rc1
commit 49776c71
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I92135

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=49776c712eb6ded12fcbb8cc915a498dbfb47311



--------------------------------

The devm_ioremap_resource() function returns error pointers on error,
it never returns NULL.  Update the check accordingly.

Intel-SIG: commit 49776c71 powercap: RAPL: Fix a NULL vs IS_ERR() bug.
Backport Intel RAPL driver support on TPMI.

Fixes: 9eef7f9d ("powercap: intel_rapl: Introduce RAPL TPMI interface driver")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Acked-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Xiaolong Wang: amend commit log ]
Signed-off-by: default avatarXiaolong Wang <xiaolong.wang@intel.com>
parent 6b9faa4d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment