aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/tpm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/char/tpm')
-rw-r--r--drivers/char/tpm/tpm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c
index f354d720b777..ae766d868454 100644
--- a/drivers/char/tpm/tpm.c
+++ b/drivers/char/tpm/tpm.c
@@ -1028,7 +1028,7 @@ ssize_t tpm_write(struct file *file, const char __user *buf,
1028 size_t size, loff_t *off) 1028 size_t size, loff_t *off)
1029{ 1029{
1030 struct tpm_chip *chip = file->private_data; 1030 struct tpm_chip *chip = file->private_data;
1031 int in_size = size, out_size; 1031 size_t in_size = size, out_size;
1032 1032
1033 /* cannot perform a write until the read has cleared 1033 /* cannot perform a write until the read has cleared
1034 either via tpm_read or a user_read_timer timeout */ 1034 either via tpm_read or a user_read_timer timeout */
@@ -1063,7 +1063,7 @@ ssize_t tpm_read(struct file *file, char __user *buf,
1063 size_t size, loff_t *off) 1063 size_t size, loff_t *off)
1064{ 1064{
1065 struct tpm_chip *chip = file->private_data; 1065 struct tpm_chip *chip = file->private_data;
1066 int ret_size; 1066 ssize_t ret_size;
1067 1067
1068 del_singleshot_timer_sync(&chip->user_read_timer); 1068 del_singleshot_timer_sync(&chip->user_read_timer);
1069 flush_scheduled_work(); 1069 flush_scheduled_work();