svn commit: r246042 - in head/sys/dev/acpica: . Osd

[Jung-uk Kim]

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