diff --git a/[refs] b/[refs]
index 9ef8951004bf..f2a77bb8063c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ca4a031f6b43edb8745ebc0a1b7307c24719dae4
+refs/heads/master: 1c40f7d4f0a9d5242f19b02b00e3e5a8ee218a20
diff --git a/trunk/drivers/char/tpm/tpm_bios.c b/trunk/drivers/char/tpm/tpm_bios.c
index 9ffa5643e79d..1310189fd9f5 100644
--- a/trunk/drivers/char/tpm/tpm_bios.c
+++ b/trunk/drivers/char/tpm/tpm_bios.c
@@ -220,8 +220,8 @@ static int get_event_name(char *dest, struct tcpa_event *event,
 		}
 		break;
 	case EVENT_TAG:
-		event_id = be32_to_cpu(event_entry);
-		event_data_size = be32_to_cpu(&event_entry[4]);
+		event_id = be32_to_cpu(*((u32 *)event_entry));
+		event_data_size = be32_to_cpu(((u32 *)event_entry)[1]);
 
 		/* ToDo Row data -> Base64 */