From owner-svn-src-all@FreeBSD.ORG  Mon Jan 28 21:10:36 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 2EBDF3D8;
 Mon, 28 Jan 2013 21:10:36 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0A066B55;
 Mon, 28 Jan 2013 21:10:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0SLAZvA019448;
 Mon, 28 Jan 2013 21:10:35 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0SLAZQ0019446;
 Mon, 28 Jan 2013 21:10:35 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201301282110.r0SLAZQ0019446@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 28 Jan 2013 21:10:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r246042 - in head/sys/dev/acpica: . Osd
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 21:10:36 -0000

Author: jkim
Date: Mon Jan 28 21:10:35 2013
New Revision: 246042
URL: http://svnweb.freebsd.org/changeset/base/246042

Log:
  Fix two misusages of return_*() macros for ACPICA.
  
  Noticed by:	avg

Modified:
  head/sys/dev/acpica/Osd/OsdSchedule.c
  head/sys/dev/acpica/acpi_pcib.c

Modified: head/sys/dev/acpica/Osd/OsdSchedule.c
==============================================================================
--- head/sys/dev/acpica/Osd/OsdSchedule.c	Mon Jan 28 21:06:20 2013	(r246041)
+++ head/sys/dev/acpica/Osd/OsdSchedule.c	Mon Jan 28 21:10:35 2013	(r246042)
@@ -181,6 +181,7 @@ ACPI_STATUS
 AcpiOsExecute(ACPI_EXECUTE_TYPE Type, ACPI_OSD_EXEC_CALLBACK Function,
     void *Context)
 {
+    ACPI_STATUS status;
     int pri;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
@@ -211,7 +212,8 @@ AcpiOsExecute(ACPI_EXECUTE_TYPE Type, AC
 	return_ACPI_STATUS(AE_BAD_PARAMETER);
     }
 
-    return_ACPI_STATUS(acpi_task_enqueue(pri, Function, Context));
+    status = acpi_task_enqueue(pri, Function, Context);
+    return_ACPI_STATUS(status);
 }
 
 void

Modified: head/sys/dev/acpica/acpi_pcib.c
==============================================================================
--- head/sys/dev/acpica/acpi_pcib.c	Mon Jan 28 21:06:20 2013	(r246041)
+++ head/sys/dev/acpica/acpi_pcib.c	Mon Jan 28 21:10:35 2013	(r246042)
@@ -130,6 +130,7 @@ int
 acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno)
 {
     ACPI_STATUS status;
+    int error;
 
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
@@ -168,7 +169,8 @@ acpi_pcib_attach(device_t dev, ACPI_BUFF
      */
     prt_walk_table(prt, prt_attach_devices, dev);
 
-    return_VALUE(bus_generic_attach(dev));
+    error = bus_generic_attach(dev);
+    return_VALUE(error);
 }
 
 static void