Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba396115 authored by Kylene Jo Hall's avatar Kylene Jo Hall Committed by Linus Torvalds
Browse files

[PATCH] tpm: use flush_scheduled_work() 



Add the necessary flush_schedule_work calls when canceling the timer.

Signed-off-by: default avatarKylene Hall <kjhall@us.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 966cc04b

drivers/char/tpm/tpm.c

+2 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ int tpm_release(struct inode *inode, struct file *file) 
	file->private_data = NULL;

	chip->num_opens--;

	del_singleshot_timer_sync(&chip->user_read_timer);

	flush_scheduled_work();

	atomic_set(&chip->data_pending, 0);

	put_device(chip->dev);

	kfree(chip->data_buffer);
@@ -428,6 +429,7 @@ ssize_t tpm_read(struct file * file, char __user *buf, 
	int ret_size;



	del_singleshot_timer_sync(&chip->user_read_timer);

	flush_scheduled_work();

	ret_size = atomic_read(&chip->data_pending);

	atomic_set(&chip->data_pending, 0);

	if (ret_size > 0) {	/* relay data */