fix up tpm patch

diff --git a/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch b/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch
index 77e2457c186cb4231178c7829a960dd5a6ea12c9..9dbb5bfbd6feb40be60322495b1b20f51eb0c0dd 100644 (file)
--- a/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch
+++ b/queue-4.14/tpm_tis-explicitly-check-for-error-code.patch
@@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/char/tpm/tpm_tis_core.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ drivers/char/tpm/tpm_tis_core.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 --- a/drivers/char/tpm/tpm_tis_core.c
 +++ b/drivers/char/tpm/tpm_tis_core.c
-@@ -228,8 +228,13 @@ static int tpm_tis_recv(struct tpm_chip
+@@ -209,6 +209,7 @@ static int tpm_tis_recv(struct tpm_chip
+       int size = 0;
+       int status;
+       u32 expected;
++      int rc;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -228,8 +229,13 @@ static int tpm_tis_recv(struct tpm_chip
                goto out;
        }
  

diff --git a/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch b/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch
index 915b9c72f234b207920b71a3dfcddd704dc471cc..fd6f30da0e9c96e4234783979408f89f99baa563 100644 (file)
--- a/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch
+++ b/queue-4.19/tpm_tis-explicitly-check-for-error-code.patch
@@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/char/tpm/tpm_tis_core.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ drivers/char/tpm/tpm_tis_core.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 --- a/drivers/char/tpm/tpm_tis_core.c
 +++ b/drivers/char/tpm/tpm_tis_core.c
-@@ -289,8 +289,13 @@ static int tpm_tis_recv(struct tpm_chip
+@@ -270,6 +270,7 @@ static int tpm_tis_recv(struct tpm_chip
+       int size = 0;
+       int status;
+       u32 expected;
++      int rc;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -289,8 +290,13 @@ static int tpm_tis_recv(struct tpm_chip
                goto out;
        }
  

diff --git a/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch
index c5ea4252b3c87b3b6ea541f83d769f0adfb169e9..70d2306e2cf9e157d5ee47ea5514abdaf6de252a 100644 (file)
--- a/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch
+++ b/queue-5.10/tpm_tis-explicitly-check-for-error-code.patch
@@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/char/tpm/tpm_tis_core.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ drivers/char/tpm/tpm_tis_core.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 --- a/drivers/char/tpm/tpm_tis_core.c
 +++ b/drivers/char/tpm/tpm_tis_core.c
-@@ -333,8 +333,13 @@ static int tpm_tis_recv(struct tpm_chip
+@@ -314,6 +314,7 @@ static int tpm_tis_recv(struct tpm_chip
+       int size = 0;
+       int status;
+       u32 expected;
++      int rc;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -333,8 +334,13 @@ static int tpm_tis_recv(struct tpm_chip
                goto out;
        }
  

diff --git a/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch
index c5ea4252b3c87b3b6ea541f83d769f0adfb169e9..70d2306e2cf9e157d5ee47ea5514abdaf6de252a 100644 (file)
--- a/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch
+++ b/queue-5.15/tpm_tis-explicitly-check-for-error-code.patch
@@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/char/tpm/tpm_tis_core.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ drivers/char/tpm/tpm_tis_core.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 --- a/drivers/char/tpm/tpm_tis_core.c
 +++ b/drivers/char/tpm/tpm_tis_core.c
-@@ -333,8 +333,13 @@ static int tpm_tis_recv(struct tpm_chip
+@@ -314,6 +314,7 @@ static int tpm_tis_recv(struct tpm_chip
+       int size = 0;
+       int status;
+       u32 expected;
++      int rc;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -333,8 +334,13 @@ static int tpm_tis_recv(struct tpm_chip
                goto out;
        }
  

diff --git a/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch b/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch
index 6f58c05a773dc3d00a0793a35845176ac131728c..5c461a9b9d56959f554c56edb0819939f0247350 100644 (file)
--- a/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch
+++ b/queue-5.4/tpm_tis-explicitly-check-for-error-code.patch
@@ -25,12 +25,20 @@ Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- drivers/char/tpm/tpm_tis_core.c |    9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
+ drivers/char/tpm/tpm_tis_core.c |   10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 --- a/drivers/char/tpm/tpm_tis_core.c
 +++ b/drivers/char/tpm/tpm_tis_core.c
-@@ -285,8 +285,13 @@ static int tpm_tis_recv(struct tpm_chip
+@@ -266,6 +266,7 @@ static int tpm_tis_recv(struct tpm_chip
+       int size = 0;
+       int status;
+       u32 expected;
++      int rc;
+ 
+       if (count < TPM_HEADER_SIZE) {
+               size = -EIO;
+@@ -285,8 +286,13 @@ static int tpm_tis_recv(struct tpm_chip
                goto out;
        }