---

yaml --- r: 113647 b: refs/heads/master c: 4bdec11 h: refs/heads/master i: 113645: b3dc0a6 113643: 1cb2a0a 113639: f01db82 113631: d82f6b3 v: v3
git-mirror · Oct 10, 2008 · 0760da0 · 0760da0
1 parent f7cb568
commit 0760da0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);