From patchwork Thu Mar 14 04:21:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chen Gang X-Patchwork-Id: 2267461 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D1AA1DFB79 for ; Thu, 14 Mar 2013 04:21:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751152Ab3CNEVz (ORCPT ); Thu, 14 Mar 2013 00:21:55 -0400 Received: from intranet.asianux.com ([58.214.24.6]:6981 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751015Ab3CNEVz (ORCPT ); Thu, 14 Mar 2013 00:21:55 -0400 Received: by intranet.asianux.com (Postfix, from userid 103) id 5064C18402BC; Thu, 14 Mar 2013 12:21:54 +0800 (CST) X-Spam-Score: -100.8 X-Spam-Checker-Version: SpamAssassin 3.1.9 (2007-02-13) on intranet.asianux.com X-Spam-Level: X-Spam-Status: No, score=-100.8 required=5.0 tests=AWL,BAYES_00, RATWARE_GECKO_BUILD,USER_IN_WHITELIST autolearn=no version=3.1.9 Received: from [10.1.0.143] (unknown [219.143.36.82]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by intranet.asianux.com (Postfix) with ESMTP id E67B41840251; Thu, 14 Mar 2013 12:21:53 +0800 (CST) Message-ID: <51415048.6000607@asianux.com> Date: Thu, 14 Mar 2013 12:21:28 +0800 From: Chen Gang User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130110 Thunderbird/17.0.2 MIME-Version: 1.0 To: Tony Lindgren CC: Russell King - ARM Linux , "linux-arm-kernel@lists.infradead.org" , linux-omap@vger.kernel.org Subject: [PATCH] ARM:OMAP2: an issue about curr_pwrst, u8 is never < 0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org if pwrdm_read_pwrst returns negative number, curr_pwrst can not notice it. since really need check curr_pwrst whether is negative, need let the check valid in _pwrdm_save_clkdm_state_and_activate. and also better to check the return value of pwrdm_read_pwrst, firstly. Signed-off-by: Chen Gang --- arch/arm/mach-omap2/powerdomain.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/powerdomain.c b/arch/arm/mach-omap2/powerdomain.c index 43ac20c..876d067 100644 --- a/arch/arm/mach-omap2/powerdomain.c +++ b/arch/arm/mach-omap2/powerdomain.c @@ -233,7 +233,7 @@ static u8 _pwrdm_save_clkdm_state_and_activate(struct powerdomain *pwrdm, { u8 sleep_switch; - if (curr_pwrst < 0) { + if ((char)curr_pwrst < 0) { WARN_ON(1); sleep_switch = ERROR_SWITCH; } else if (curr_pwrst < PWRDM_POWER_ON) { @@ -1106,7 +1106,10 @@ int omap_set_pwrdm_state(struct powerdomain *pwrdm, u8 pwrst) pwrdm_lock(pwrdm); - curr_pwrst = pwrdm_read_pwrst(pwrdm); + ret = pwrdm_read_pwrst(pwrdm); + if (ret < 0) + goto osps_out; + curr_pwrst = (u8)(unsigned int)ret; next_pwrst = pwrdm_read_next_pwrst(pwrdm); if (curr_pwrst == pwrst && next_pwrst == pwrst) goto osps_out;