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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 356D2C33CB3 for ; Tue, 28 Jan 2020 14:41:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0391A24696 for ; Tue, 28 Jan 2020 14:41:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580222468; bh=ovyg9rOdRhnWjAyCJAiP7l4cs3HUvteGl44V31baW5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gAFSKoZTHyvuvCrP0FTjtDnJkDhO75sWqL1TSAUuq8uc5jVoepLj4cnGAzxOsLjl8 v6uK5P+EY3gJmvMEWq45CfeHhmdh4BY8F7DSJhaOqUtH5erAsx72CbuJQf8JiYEzAz USnAIhTkuM885J+qc6IKXohVHG0jIPLcHPzY2Lwg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729632AbgA1OlH (ORCPT ); Tue, 28 Jan 2020 09:41:07 -0500 Received: from mail.kernel.org ([198.145.29.99]:36662 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729359AbgA1OOb (ORCPT ); Tue, 28 Jan 2020 09:14:31 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3A39D2468A; Tue, 28 Jan 2020 14:14:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220870; bh=ovyg9rOdRhnWjAyCJAiP7l4cs3HUvteGl44V31baW5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dc9ulyBrkIHCuMgkqpAtbP7Gjp+sJVBw3I/MBYYQGYBfOSqzDaO5Lx9tMquAy293m NGzV4Ja+3ufK/loKyivESR3XxxCJoHk2kb5kbBHfG1aou6AvuDoKx+bDi+hEkdosrQ gzhqbkQH19sbSGbWb4JRe6Gn67a+IHAt6ge/n0cg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tiezhu Yang , Paul Burton , Ralf Baechle , James Hogan , Huacai Chen , Jiaxun Yang , linux-mips@vger.kernel.org, Sasha Levin Subject: [PATCH 4.4 153/183] MIPS: Loongson: Fix return value of loongson_hwmon_init Date: Tue, 28 Jan 2020 15:06:12 +0100 Message-Id: <20200128135845.061700335@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135829.486060649@linuxfoundation.org> References: <20200128135829.486060649@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 0f6c63e17049e..9a201c3caaf41 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