From 0760da08cdabf72cadee8afea4090c1d477e36df Mon Sep 17 00:00:00 2001 From: Rajiv Andrade Date: Sat, 11 Oct 2008 09:05:20 +1100 Subject: [PATCH] --- yaml --- r: 113647 b: refs/heads/master c: 4bdec11f560b8f405a011288a50e65b1a81b3654 h: refs/heads/master i: 113645: b3dc0a61ef7b3d305a81a00e9aa72e9523131b70 113643: 1cb2a0a8c684b33320878ad25544860a5009ad36 113639: f01db82e5e1d60981c3b5d63fe025cb22fd6da1d 113631: d82f6b3f73e8e64181242608a7da82a5be2e77fe v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bcc3e2478884..4d0b02f6a8a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 15c220d003f7914aab99cdb71cd7834a0c9b4557 +refs/heads/master: 4bdec11f560b8f405a011288a50e65b1a81b3654 diff --git a/trunk/drivers/char/tpm/tpm.c b/trunk/drivers/char/tpm/tpm.c index 02a495c2e068..1fee7034a386 100644 --- a/trunk/drivers/char/tpm/tpm.c +++ b/trunk/drivers/char/tpm/tpm.c @@ -1004,9 +1004,9 @@ int tpm_release(struct inode *inode, struct file *file) { struct tpm_chip *chip = file->private_data; + del_singleshot_timer_sync(&chip->user_read_timer); flush_scheduled_work(); file->private_data = NULL; - del_singleshot_timer_sync(&chip->user_read_timer); atomic_set(&chip->data_pending, 0); kfree(chip->data_buffer); clear_bit(0, &chip->is_open);