From patchwork Thu Sep 1 12:49:59 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 1119202 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p81E2ZSd025526 for ; Thu, 1 Sep 2011 14:02:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757588Ab1IAOCe (ORCPT ); Thu, 1 Sep 2011 10:02:34 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:57089 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757571Ab1IAOCd (ORCPT ); Thu, 1 Sep 2011 10:02:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Date:Sender:Message-Id:Content-Type:MIME-Version:Cc:Subject:Cc:To:From:References:In-Reply-To; bh=1bARNp1FTrKR+lsYJGKiwh18KjhgLmzct0U+8X9OgEc=; b=VoPnKFqmdl5G44r0eMdbIsTkCStZxKLZL1SVnzfqKKzpDjexhZFl0/9ULoOITKdcX/y0AKhWZLjR0bYFh/N+3YzHuJnb8IW1NGsqjZnZgaC5rVLUQ7pRNIeRUr26EmM8+fHUVVzfCVEoPOV0dJtOWg9Ht0wfO8PCdvMDRRwvZXw=; Received: from e0022681537dd.dyn.arm.linux.org.uk ([2002:4e20:1eda:1:222:68ff:fe15:37dd] helo=rmk-PC.arm.linux.org.uk) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1Qz7oA-0004G0-Ps; Thu, 01 Sep 2011 14:59:55 +0100 Received: from rmk by rmk-PC.arm.linux.org.uk with local (Exim 4.76) (envelope-from ) id 1Qz6iV-00078R-9z; Thu, 01 Sep 2011 13:49:59 +0100 In-Reply-To: <20110901124752.GE29729@n2100.arm.linux.org.uk> References: <20110901124752.GE29729@n2100.arm.linux.org.uk> From: Russell King - ARM Linux To: Santosh Shilimkar Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Subject: [PATCH 05/11] ARM: pm: force non-zero return value from __cpu_suspend when aborting Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline Message-Id: Date: Thu, 01 Sep 2011 13:49:59 +0100 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 01 Sep 2011 14:02:35 +0000 (UTC) Ensure that the return value from __cpu_suspend is non-zero when aborting. Zero indicates a successful suspend occurred. Signed-off-by: Russell King --- arch/arm/kernel/sleep.S | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index dc902f2..46a9f46 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -61,6 +61,8 @@ ENDPROC(__cpu_suspend) cpu_suspend_abort: ldmia sp!, {r1 - r3} @ pop v:p, virt SP, phys resume fn + teq r0, #0 + moveq r0, #1 @ force non-zero value mov sp, r2 ldmfd sp!, {r4 - r11, pc} ENDPROC(cpu_suspend_abort)