diff --git a/[refs] b/[refs]
index 587bc6750077..e9d7c5661099 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20328b56cdf8fcc79f28c6c50ad8190fc0779e80
+refs/heads/master: f334ac8da82478b3f8c52e3c01849ad7fe509d5b
diff --git a/trunk/drivers/char/tpm/tpm_acpi.c b/trunk/drivers/char/tpm/tpm_acpi.c
index a1bb5a182df9..fe3fa9431dc9 100644
--- a/trunk/drivers/char/tpm/tpm_acpi.c
+++ b/trunk/drivers/char/tpm/tpm_acpi.c
@@ -96,6 +96,11 @@ int read_log(struct tpm_bios_log *log)
 	log->bios_event_log_end = log->bios_event_log + len;
 
 	virt = acpi_os_map_memory(start, len);
+	if (!virt) {
+		kfree(log->bios_event_log);
+		printk("%s: ERROR - Unable to map memory\n", __func__);
+		return -EIO;
+	}
 
 	memcpy(log->bios_event_log, virt, len);