From patchwork Thu Jan 31 03:22:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yasuaki Ishimatsu X-Patchwork-Id: 2070711 Return-Path: X-Original-To: patchwork-linux-acpi@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 40E6F3FCDE for ; Thu, 31 Jan 2013 03:22:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754199Ab3AaDWi (ORCPT ); Wed, 30 Jan 2013 22:22:38 -0500 Received: from fgwmail6.fujitsu.co.jp ([192.51.44.36]:53016 "EHLO fgwmail6.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753310Ab3AaDWh (ORCPT ); Wed, 30 Jan 2013 22:22:37 -0500 Received: from m4.gw.fujitsu.co.jp (unknown [10.0.50.74]) by fgwmail6.fujitsu.co.jp (Postfix) with ESMTP id B3A863EE0AE; Thu, 31 Jan 2013 12:22:36 +0900 (JST) Received: from smail (m4 [127.0.0.1]) by outgoing.m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 9BD7345DE4E; Thu, 31 Jan 2013 12:22:36 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (s4.gw.fujitsu.co.jp [10.0.50.94]) by m4.gw.fujitsu.co.jp (Postfix) with ESMTP id 8547145DE4D; Thu, 31 Jan 2013 12:22:36 +0900 (JST) Received: from s4.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 788CDE08001; Thu, 31 Jan 2013 12:22:36 +0900 (JST) Received: from g01jpexchyt31.g01.fujitsu.local (g01jpexchyt31.g01.fujitsu.local [10.128.193.114]) by s4.gw.fujitsu.co.jp (Postfix) with ESMTP id 2C1F41DB802F; Thu, 31 Jan 2013 12:22:36 +0900 (JST) Received: from [127.0.0.1] (10.124.101.33) by g01jpexchyt31.g01.fujitsu.local (10.128.193.114) with Microsoft SMTP Server id 14.2.309.2; Thu, 31 Jan 2013 12:22:32 +0900 X-SecurityPolicyCheck: OK by SHieldMailChecker v1.7.4 Message-ID: <5109E366.4090703@jp.fujitsu.com> Date: Thu, 31 Jan 2013 12:22:14 +0900 From: Yasuaki Ishimatsu User-Agent: Mozilla/5.0 (Windows NT 5.1; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: "Rafael J. Wysocki" , ACPI Devel Maling List , LKML , Mika Westerberg , Yinghai Lu , Toshi Kani Subject: [RESEND PATCH 1/4] ACPI/PM: Fix acpi_bus_get_device() check in drivers/acpi/device_pm.c References: <1451967.YMyGeCCNtu@vostro.rjw.lan> <6099377.PFvsxPeyib@vostro.rjw.lan> <5109E11A.5030400@jp.fujitsu.com> <5109E189.7040105@jp.fujitsu.com> In-Reply-To: <5109E189.7040105@jp.fujitsu.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org I fogot to change subject. So I resend a patch. --- acpi_bus_get_device() returns int not acpi_status. The patch change not to apply ACPI_FAILURE() to the return value of acpi_bus_get_device(). Signed-off-by: Yasuaki Ishimatsu --- drivers/acpi/device_pm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" 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/device_pm.c =================================================================== --- linux-pm.orig/drivers/acpi/device_pm.c 2013-01-31 11:04:30.000000000 +0900 +++ linux-pm/drivers/acpi/device_pm.c 2013-01-31 11:28:51.366849592 +0900 @@ -213,7 +213,7 @@ int acpi_pm_device_sleep_state(struct de acpi_handle handle = DEVICE_ACPI_HANDLE(dev); struct acpi_device *adev; - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; } @@ -290,7 +290,7 @@ int acpi_pm_device_run_wake(struct devic return -EINVAL; handle = DEVICE_ACPI_HANDLE(phys_dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(phys_dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; @@ -334,7 +334,7 @@ int acpi_pm_device_sleep_wake(struct dev return -EINVAL; handle = DEVICE_ACPI_HANDLE(dev); - if (!handle || ACPI_FAILURE(acpi_bus_get_device(handle, &adev))) { + if (!handle || acpi_bus_get_device(handle, &adev)) { dev_dbg(dev, "ACPI handle without context in %s!\n", __func__); return -ENODEV; }