Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756523AbcCXFPf (ORCPT ); Thu, 24 Mar 2016 01:15:35 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:27946 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754754AbcCXFPV (ORCPT ); Thu, 24 Mar 2016 01:15:21 -0400 From: Jisheng Zhang To: , CC: , , Jisheng Zhang Subject: [PATCH 1/2] ARM: cpuidle: fix !cpuidle_ops[cpu].init case during init Date: Thu, 24 Mar 2016 13:11:08 +0800 Message-ID: <1458796269-6158-2-git-send-email-jszhang@marvell.com> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1458796269-6158-1-git-send-email-jszhang@marvell.com> References: <1458796269-6158-1-git-send-email-jszhang@marvell.com> MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-03-24_02:,, signatures=0 X-Proofpoint-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1601100000 definitions=main-1603240079 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 873 Lines: 30 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 --- 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