| From f4ad069e60e625d2cd004daf9adf60ef8a751236 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 4 Nov 2019 21:33:50 +0800 |
| Subject: MIPS: Loongson: Fix return value of loongson_hwmon_init |
| |
| From: Tiezhu Yang <yangtiezhu@loongson.cn> |
| |
| [ 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> |
| --- |
| drivers/platform/mips/cpu_hwmon.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/platform/mips/cpu_hwmon.c b/drivers/platform/mips/cpu_hwmon.c |
| index 4300a558d0f39..d02214a3f8e3f 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; |
| } |
| -- |
| 2.20.1 |
| |
