From patchwork Thu Jul 1 21:58:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 109676 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o61M2Pr8026261 for ; Thu, 1 Jul 2010 22:02:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758918Ab0GAWCS (ORCPT ); Thu, 1 Jul 2010 18:02:18 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:42605 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756466Ab0GAWCR (ORCPT ); Thu, 1 Jul 2010 18:02:17 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id D5E4618A992; Thu, 1 Jul 2010 23:48:34 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 06712-08; Thu, 1 Jul 2010 23:48:21 +0200 (CEST) Received: from ferrari.localnet (220-bem-13.acn.waw.pl [82.210.184.220]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 402C818A994; Thu, 1 Jul 2010 23:48:21 +0200 (CEST) From: "Rafael J. Wysocki" To: linux-pm@lists.linux-foundation.org Subject: [PATCH 1/3] PM / Hibernate: Fix hibernation_platform_enter() Date: Thu, 1 Jul 2010 23:58:15 +0200 User-Agent: KMail/1.13.3 (Linux/2.6.35-rc3-rjw+; KDE/4.4.3; x86_64; ; ) Cc: ACPI Devel Maling List , Matthew Garrett , Len Brown References: <201007012356.44690.rjw@sisk.pl> In-Reply-To: <201007012356.44690.rjw@sisk.pl> MIME-Version: 1.0 Message-Id: <201007012358.15229.rjw@sisk.pl> X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 01 Jul 2010 22:02:26 +0000 (UTC) Index: linux-2.6/kernel/power/hibernate.c =================================================================== --- linux-2.6.orig/kernel/power/hibernate.c +++ linux-2.6/kernel/power/hibernate.c @@ -530,7 +530,7 @@ int hibernation_platform_enter(void) Platform_finish: hibernation_ops->finish(); - dpm_suspend_noirq(PMSG_RESTORE); + dpm_resume_noirq(PMSG_RESTORE); Resume_devices: entering_platform_hibernation = false;