From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1C825C33CB8 for ; Thu, 16 Jan 2020 17:48:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E14B22468D for ; Thu, 16 Jan 2020 17:48:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196899; bh=SbTA/AdcjdIEurBZ3H9u4iaIzuL/XEM7tqhJuRT0Li0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=HiSz1mWLQNryTWh564lJiB2s18Am1dExWDSuiEORpLcO/l8hqyyI981EyFKo742z2 bg9DC5X5UjsOFhAJ8p9KN8KL8aEa/01JPYJf4/g9UM+kIQSMY4TjJZlpuojrOkFTNX YNoKrEAraxfex6vpVoLutEBxgrfciJkJIhtJsRGI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406761AbgAPRql (ORCPT ); Thu, 16 Jan 2020 12:46:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:39686 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406750AbgAPRql (ORCPT ); Thu, 16 Jan 2020 12:46:41 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C10FD246DC; Thu, 16 Jan 2020 17:46:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196800; bh=SbTA/AdcjdIEurBZ3H9u4iaIzuL/XEM7tqhJuRT0Li0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=GybXhFpTDpIJyUGdQtqhTd5fUyM40KAEfz9BMe9leUFYG4g18VtyTEuBEQWG4MeEA hYdKnodWSr7TP3t61W8IWk+JOscKR/xnpHM4mXFKAHHCzeRkGQkBprCcqlJuzGz3dk wCZ2iFwXAa4LKVXYl4s9VK4NpOKH1mh5U4KWv+pI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Tiezhu Yang , Paul Burton , Ralf Baechle , James Hogan , Huacai Chen , Jiaxun Yang , linux-mips@vger.kernel.org, Sasha Levin Subject: [PATCH AUTOSEL 4.4 160/174] MIPS: Loongson: Fix return value of loongson_hwmon_init Date: Thu, 16 Jan 2020 12:42:37 -0500 Message-Id: <20200116174251.24326-160-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116174251.24326-1-sashal@kernel.org> References: <20200116174251.24326-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-mips-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mips@vger.kernel.org From: Tiezhu Yang [ 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 Signed-off-by: Paul Burton Cc: Ralf Baechle Cc: James Hogan Cc: Huacai Chen Cc: Jiaxun Yang Cc: linux-mips@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Sasha Levin --- 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 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; } -- 2.20.1