aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/acpica/exregion.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2010-10-25 02:10:36 -0400
committerLen Brown <len.brown@intel.com>2010-10-25 02:10:36 -0400
commitaca209e5e654951a3a90f5aaa8e04e0c470993b4 (patch)
tree5de472175d8edcbdf7a98022af7bf650bde761e9 /drivers/acpi/acpica/exregion.c
parentf6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff)
parent8df3fc981dc12d9fdcaef4100a2193b605024d7a (diff)
Merge branch 'acpica' into release
Conflicts: drivers/acpi/acpica/aclocal.h Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/exregion.c')
-rw-r--r--drivers/acpi/acpica/exregion.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/acpi/acpica/exregion.c b/drivers/acpi/acpica/exregion.c
index 8819d2ac5ae..de17e10da0e 100644
--- a/drivers/acpi/acpica/exregion.c
+++ b/drivers/acpi/acpica/exregion.c
@@ -353,7 +353,6 @@ acpi_ex_pci_config_space_handler(u32 function,
acpi_status status = AE_OK;
struct acpi_pci_id *pci_id;
u16 pci_register;
- u32 value32;
ACPI_FUNCTION_TRACE(ex_pci_config_space_handler);
@@ -381,8 +380,7 @@ acpi_ex_pci_config_space_handler(u32 function,
case ACPI_READ:
status = acpi_os_read_pci_configuration(pci_id, pci_register,
- &value32, bit_width);
- *value = value32;
+ value, bit_width);
break;
case ACPI_WRITE: