From patchwork Tue Jan 22 02:11:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rafael Wysocki X-Patchwork-Id: 2015121 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 DB955DFE76 for ; Tue, 22 Jan 2013 02:07:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752976Ab3AVCHQ (ORCPT ); Mon, 21 Jan 2013 21:07:16 -0500 Received: from hydra.sisk.pl ([212.160.235.94]:48951 "EHLO hydra.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752267Ab3AVCHP (ORCPT ); Mon, 21 Jan 2013 21:07:15 -0500 Received: from vostro.rjw.lan (afcl124.neoplus.adsl.tpnet.pl [95.49.63.124]) by hydra.sisk.pl (Postfix) with ESMTPSA id 8AF48E564E; Tue, 22 Jan 2013 03:07:39 +0100 (CET) From: "Rafael J. Wysocki" To: ACPI Devel Maling List Cc: LKML , Linux PM list , Lv Zheng , Mika Westerberg Subject: [PATCH 4/4] ACPI / PM: Sanitize checks in acpi_power_on_resources() Date: Tue, 22 Jan 2013 03:11:32 +0100 Message-ID: <2460397.W1PpBYs6jy@vostro.rjw.lan> User-Agent: KMail/4.9.5 (Linux/3.8.0-rc4; KDE/4.9.5; x86_64; ; ) In-Reply-To: <1792467.qHBR6KraFh@vostro.rjw.lan> References: <1792467.qHBR6KraFh@vostro.rjw.lan> MIME-Version: 1.0 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org From: Rafael J. Wysocki After the only user of acpi_power_on_resources(), acpi_bus_init_power(), has been changed to avoid calling it for state equal to ACPI_STATE_D3_COLD, it doesn't have to special case that state any more. For this reason, modify the checks in acpi_power_on_resources() so that it returns -EINVAL for ACPI_STATE_D3_COLD as it should. Signed-off-by: Rafael J. Wysocki --- drivers/acpi/power.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-pm/drivers/acpi/power.c =================================================================== --- linux-pm.orig/drivers/acpi/power.c +++ linux-pm/drivers/acpi/power.c @@ -622,12 +622,9 @@ int acpi_power_get_inferred_state(struct int acpi_power_on_resources(struct acpi_device *device, int state) { - if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_COLD) + if (!device || state < ACPI_STATE_D0 || state > ACPI_STATE_D3_HOT) return -EINVAL; - if (state == ACPI_STATE_D3_COLD) - return 0; - return acpi_power_on_list(&device->power.states[state].resources); }