3 files changed, 7 insertions, 7 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:
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 65b25a303b8..a351291496f 100644
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
@@ -547,9 +547,10 @@ acpi_os_write_memory(acpi_physical_address phys_addr, u32 value, u32 width)
 
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
-                               u32 *value, u32 width)
+                               u64 *value, u32 width)
 {
         int result, size;
+        u32 value32;
 
         if (!value)
                 return AE_BAD_PARAMETER;
@@ -570,7 +571,8 @@ acpi_os_read_pci_configuration(struct acpi_pci_id * pci_id, u32 reg,
 
         result = raw_pci_read(pci_id->segment, pci_id->bus,
                                 PCI_DEVFN(pci_id->device, pci_id->function),
-                                reg, size, value);
+                                reg, size, &value32);
+        *value = value32;
 
         return (result ? AE_ERROR : AE_OK);
 }
@@ -626,7 +628,7 @@ static void acpi_os_derive_pci_id_2(acpi_handle rhandle,	/* upper bound  */
                 status = acpi_evaluate_integer(handle, METHOD_NAME__ADR, NULL,
                                           &temp);
                 if (ACPI_SUCCESS(status)) {
-                        u32 val;
+                        u64 val;
                         pci_id->device = ACPI_HIWORD(ACPI_LODWORD(temp));
                         pci_id->function = ACPI_LOWORD(ACPI_LODWORD(temp));
 
diff --git a/include/acpi/acpiosxf.h b/include/acpi/acpiosxf.h
index 29bf945143e..5e225779644 100644
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
@@ -223,7 +223,7 @@ acpi_os_write_memory(acpi_physical_address address, u32 value, u32 width);
  */
 acpi_status
 acpi_os_read_pci_configuration(struct acpi_pci_id *pci_id,
-                               u32 reg, u32 *value, u32 width);
+                               u32 reg, u64 *value, u32 width);
 
 acpi_status
 acpi_os_write_pci_configuration(struct acpi_pci_id *pci_id,