From patchwork Tue Jul 21 22:08:38 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 36634 X-Patchwork-Delegate: khilman@deeprootsystems.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6LMA1QU002475 for ; Tue, 21 Jul 2009 22:10:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756381AbZGUWJR (ORCPT ); Tue, 21 Jul 2009 18:09:17 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755623AbZGUWJO (ORCPT ); Tue, 21 Jul 2009 18:09:14 -0400 Received: from wf-out-1314.google.com ([209.85.200.171]:7329 "EHLO wf-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756236AbZGUWJM (ORCPT ); Tue, 21 Jul 2009 18:09:12 -0400 Received: by wf-out-1314.google.com with SMTP id 26so1009646wfd.4 for ; Tue, 21 Jul 2009 15:09:12 -0700 (PDT) Received: by 10.142.88.3 with SMTP id l3mr52281wfb.5.1248214152653; Tue, 21 Jul 2009 15:09:12 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 22sm17361294wfd.28.2009.07.21.15.09.11 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 21 Jul 2009 15:09:12 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.arm.linux.org.uk Cc: linux-omap@vger.kernel.org, Jouni Hogander Subject: [PATCH 12/14] OMAP3: PM: Fix wrong sequence in suspend. Date: Tue, 21 Jul 2009 15:08:38 -0700 Message-Id: <1248214120-18886-13-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1248214120-18886-12-git-send-email-khilman@deeprootsystems.com> References: <1248214120-18886-1-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-2-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-3-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-4-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-5-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-6-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-7-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-8-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-9-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-10-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-11-git-send-email-khilman@deeprootsystems.com> <1248214120-18886-12-git-send-email-khilman@deeprootsystems.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Jouni Hogander Powerdomain previous state is checked after restoring new states in suspend. This patch fixes this problem. Signed-off-by: Jouni Hogander Signed-off-by: Kevin Hilman --- arch/arm/mach-omap2/pm34xx.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/pm34xx.c b/arch/arm/mach-omap2/pm34xx.c index b07efb2..488d595 100644 --- a/arch/arm/mach-omap2/pm34xx.c +++ b/arch/arm/mach-omap2/pm34xx.c @@ -326,7 +326,6 @@ static int omap3_pm_suspend(void) restore: /* Restore next_pwrsts */ list_for_each_entry(pwrst, &pwrst_list, node) { - set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); state = pwrdm_read_prev_pwrst(pwrst->pwrdm); if (state > pwrst->next_state) { printk(KERN_INFO "Powerdomain (%s) didn't enter " @@ -334,6 +333,7 @@ restore: pwrst->pwrdm->name, pwrst->next_state); ret = -1; } + set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); } if (ret) printk(KERN_ERR "Could not enter target state in pm_suspend\n");