2 files changed, 7 insertions, 2 deletions

diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c
index 5d15630a5830..5d64e3acb000 100644
--- a/drivers/char/sysrq.c
+++ b/drivers/char/sysrq.c
@@ -580,8 +580,12 @@ static bool sysrq_filter(struct input_handle *handle, unsigned int type,
         case KEY_RIGHTALT:
                 if (value)
                         sysrq_alt = code;
-                else if (sysrq_down && code == sysrq_alt_use)
-                        sysrq_down = false;
+                else {
+                        if (sysrq_down && code == sysrq_alt_use)
+                                sysrq_down = false;
+
+                        sysrq_alt = 0;
+                }
                 break;
 
         case KEY_SYSRQ:
diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h
index 8e00b4ddd083..792868d24f2a 100644
--- a/drivers/char/tpm/tpm.h
+++ b/drivers/char/tpm/tpm.h
@@ -224,6 +224,7 @@ struct	tpm_readpubek_params_out {
         u8      algorithm[4];
         u8      encscheme[2];
         u8      sigscheme[2];
+        __be32  paramsize;
         u8      parameters[12]; /*assuming RSA*/
         __be32  keysize;
         u8      modulus[256];