From patchwork Wed Sep 19 03:17:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hongfeng X-Patchwork-Id: 1475761 Return-Path: X-Original-To: patchwork-linux-pm@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 5CF7CDF24C for ; Wed, 19 Sep 2012 03:18:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753831Ab2ISDSa (ORCPT ); Tue, 18 Sep 2012 23:18:30 -0400 Received: from na3sys009aog117.obsmtp.com ([74.125.149.242]:48173 "EHLO na3sys009aog117.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753752Ab2ISDSa (ORCPT ); Tue, 18 Sep 2012 23:18:30 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob117.postini.com ([74.125.148.12]) with SMTP ID DSNKUFk5fnkvC76KeDKDXRxa10mOF2nwTKio@postini.com; Tue, 18 Sep 2012 20:18:30 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 18 Sep 2012 20:18:07 -0700 Received: from localhost (unknown [10.38.164.165]) by maili.marvell.com (Postfix) with ESMTP id 02B674E510; Tue, 18 Sep 2012 20:18:07 -0700 (PDT) From: hongfeng To: pavel@ucw.cz, rjw@sisk.pl, len.brown@intel.com, gregkh@linuxfoundation.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, hongfeng , Raul Xiong , Neil Zhang Subject: [PATCH] PM / Sleep: use resume event when call dpm_resume_early Date: Wed, 19 Sep 2012 11:17:54 +0800 Message-Id: <1348024674-13050-1-git-send-email-hongfeng@marvell.com> X-Mailer: git-send-email 1.7.1 X-OriginalArrivalTime: 19 Sep 2012 03:18:07.0100 (UTC) FILETIME=[637983C0:01CD9615] Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org When dpm_suspend_noirq fail, state is PMSG_SUSPEND, should change to PMSG_RESUME when dpm_resume_early is called Change-Id: If815218d4934b4648e330235ab1ae26e713284bd Signed-off-by: Feng Hong Signed-off-by: Raul Xiong Signed-off-by: Neil Zhang --- drivers/base/power/main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 0113adc..2700f2e 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -996,7 +996,7 @@ int dpm_suspend_end(pm_message_t state) error = dpm_suspend_noirq(state); if (error) { - dpm_resume_early(state); + dpm_resume_early(resume_event(state)); return error; }