Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...

[linux-2.6-omap-h63xx.git] / drivers / char / tpm / tpm_bios.c

diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c
index a611972024e65942edb58b23d8d176ec6ae456cb..7fca5f470bebf9109313b3e69a458cd6d8cf9003 100644 (file)
--- a/drivers/char/tpm/tpm_bios.c
+++ b/drivers/char/tpm/tpm_bios.c
@@ -372,10 +372,8 @@ static int read_log(struct tpm_bios_log *log)
        }
 
        /* Find TCPA entry in RSDT (ACPI_LOGICAL_ADDRESSING) */
-       status = acpi_get_firmware_table(ACPI_TCPA_SIG, 1,
-                                        ACPI_LOGICAL_ADDRESSING,
-                                        (struct acpi_table_header **)
-                                        &buff);
+       status = acpi_get_table(ACPI_SIG_TCPA, 1,
+                               (struct acpi_table_header **)&buff);
 
        if (ACPI_FAILURE(status)) {
                printk(KERN_ERR "%s: ERROR - Could not get TCPA table\n",
@@ -409,7 +407,7 @@ static int read_log(struct tpm_bios_log *log)
 
        log->bios_event_log_end = log->bios_event_log + len;
 
-       acpi_os_map_memory(start, len, (void *) &virt);
+       virt = acpi_os_map_memory(start, len);
 
        memcpy(log->bios_event_log, virt, len);