summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTiezhu Yang <yangtiezhu@loongson.cn>2019-11-04 21:33:50 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-29 10:21:50 +0100
commit3a70aa656eb91842d88ac39fa71ed7d6d98f5d1c (patch)
tree68189ba0d72ffe6e90f4664932ffbc001785d1ca
parentd71e2360d23c4a0c92518e011dd96768221fbb5a (diff)
downloadlinux-stable-3a70aa656eb91842d88ac39fa71ed7d6d98f5d1c.tar.gz
linux-stable-3a70aa656eb91842d88ac39fa71ed7d6d98f5d1c.tar.bz2
linux-stable-3a70aa656eb91842d88ac39fa71ed7d6d98f5d1c.zip
MIPS: Loongson: Fix return value of loongson_hwmon_init
[ Upstream commit dece3c2a320b0a6d891da6ff774ab763969b6860 ] When call function hwmon_device_register failed, use the actual return value instead of always -ENOMEM. Fixes: 64f09aa967e1 ("MIPS: Loongson-3: Add CPU Hwmon platform driver") Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn> Signed-off-by: Paul Burton <paulburton@kernel.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: James Hogan <jhogan@kernel.org> Cc: Huacai Chen <chenhc@lemote.com> Cc: Jiaxun Yang <jiaxun.yang@flygoat.com> Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/platform/mips/cpu_hwmon.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c
index 0f6c63e17049..9a201c3caaf4 100644
--- a/drivers/platform/mips/cpu_hwmon.c
+++ b/drivers/platform/mips/cpu_hwmon.c
@@ -155,7 +155,7 @@ static int __init loongson_hwmon_init(void)
cpu_hwmon_dev = hwmon_device_register(NULL);
if (IS_ERR(cpu_hwmon_dev)) {
- ret = -ENOMEM;
+ ret = PTR_ERR(cpu_hwmon_dev);
pr_err("hwmon_device_register fail!\n");
goto fail_hwmon_device_register;
}