linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: jszhang@marvell.com (Jisheng Zhang)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/2] ARM: cpuidle: fix !cpuidle_ops[cpu].init case during init
Date: Thu, 24 Mar 2016 13:11:08 +0800	[thread overview]
Message-ID: <1458796269-6158-2-git-send-email-jszhang@marvell.com> (raw)
In-Reply-To: <1458796269-6158-1-git-send-email-jszhang@marvell.com>

Let's assume cpuidle_ops exists but it doesn't implement the according
init member, current arm_cpuidle_init() will return success to its
caller, but in fact it should return -EOPNOTSUPP.

Signed-off-by: Jisheng Zhang <jszhang@marvell.com>
---
 arch/arm/kernel/cpuidle.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/arch/arm/kernel/cpuidle.c b/arch/arm/kernel/cpuidle.c
index 703926e..f108d8f 100644
--- a/arch/arm/kernel/cpuidle.c
+++ b/arch/arm/kernel/cpuidle.c
@@ -143,8 +143,12 @@ int __init arm_cpuidle_init(int cpu)
 		return -ENODEV;
 
 	ret = arm_cpuidle_read_ops(cpu_node, cpu);
-	if (!ret && cpuidle_ops[cpu].init)
-		ret = cpuidle_ops[cpu].init(cpu_node, cpu);
+	if (!ret) {
+		if (cpuidle_ops[cpu].init)
+			ret = cpuidle_ops[cpu].init(cpu_node, cpu);
+		else
+			ret = -EOPNOTSUPP;
+	}
 
 	of_node_put(cpu_node);
 
-- 
2.8.0.rc3

  reply	other threads:[~2016-03-24  5:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-24  5:11 [PATCH 0/2] ARM: cpuidle: bug fix and a trivial improvement Jisheng Zhang
2016-03-24  5:11 ` Jisheng Zhang [this message]
2016-03-25 11:46   ` [PATCH 1/2] ARM: cpuidle: fix !cpuidle_ops[cpu].init case during init Daniel Lezcano
2016-03-30  7:16     ` Jisheng Zhang
2016-03-30  8:09       ` Daniel Lezcano
2016-03-30  8:17         ` Jisheng Zhang
2016-03-30  8:41           ` Daniel Lezcano
2016-03-30  8:43             ` Jisheng Zhang
2016-03-30  9:31               ` Daniel Lezcano
2016-03-30  9:42                 ` Jisheng Zhang
2016-03-30 10:36         ` Lorenzo Pieralisi
2016-03-24  5:11 ` [PATCH 2/2] ARM: cpuidle: make arm_cpuidle_suspend() a bit more efficient Jisheng Zhang
2016-03-25 11:52   ` Daniel Lezcano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1458796269-6158-2-git-send-email-jszhang@marvell.com \
    --to=jszhang@marvell.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).