From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764924AbXHQNUc (ORCPT ); Fri, 17 Aug 2007 09:20:32 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755404AbXHQNUY (ORCPT ); Fri, 17 Aug 2007 09:20:24 -0400 Received: from ogre.sisk.pl ([217.79.144.158]:57051 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751154AbXHQNUW convert rfc822-to-8bit (ORCPT ); Fri, 17 Aug 2007 09:20:22 -0400 From: "Rafael J. Wysocki" To: Andrew Morton , Jaroslav Kysela Subject: [PATCH -mm] PNP: Make pnpacpi_suspend handle errors Date: Fri, 17 Aug 2007 15:30:28 +0200 User-Agent: KMail/1.9.5 Cc: ACPI Devel Maling List , Len Brown , LKML , Pavel Machek , pm list MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-2" Content-Transfer-Encoding: 8BIT Content-Disposition: inline Message-Id: <200708171530.29592.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki pnpacpi_suspend() doesn't check the result returned by acpi_pm_device_sleep_state() before passing it to acpi_bus_set_power(), which may not be desirable.  Make it select the target power state of the device using its second argument if acpi_pm_device_sleep_state() fails. Signed-off-by: Rafael J. Wysocki Looks-ok-to: Pavel Machek --- drivers/pnp/pnpacpi/core.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) Index: linux-2.6.23-rc3/drivers/pnp/pnpacpi/core.c =================================================================== --- linux-2.6.23-rc3.orig/drivers/pnp/pnpacpi/core.c 2007-08-15 14:56:58.000000000 +0200 +++ linux-2.6.23-rc3/drivers/pnp/pnpacpi/core.c 2007-08-15 15:08:36.000000000 +0200 @@ -130,11 +130,16 @@ static int pnpacpi_disable_resources(str #ifdef CONFIG_ACPI_SLEEP static int pnpacpi_suspend(struct pnp_dev *dev, pm_message_t state) { - return acpi_bus_set_power((acpi_handle) dev->data, - acpi_pm_device_sleep_state(&dev->dev, - device_may_wakeup - (&dev->dev), - NULL)); + int power_state; + + power_state = acpi_pm_device_sleep_state(&dev->dev, + device_may_wakeup(&dev->dev), + NULL); + if (power_state < 0) + power_state = (state.event == PM_EVENT_ON) ? + ACPI_STATE_D0 : ACPI_STATE_D3; + + return acpi_bus_set_power((acpi_handle) dev->data, power_state); } static int pnpacpi_resume(struct pnp_dev *dev)