---

yaml --- r: 311603 b: refs/heads/master c: dab058f h: refs/heads/master i: 311601: f7f3131 311599: 2811347 v: v3
git-mirror · Jul 3, 2012 · 62af5f6 · 62af5f6
1 parent 6d05b6c
commit 62af5f6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a3da2c6913469ecb2224d891c45470b37b4d67f4
+refs/heads/master: dab058fd5ff834cb3b9de1d930ce731a605eb0c6
diff --git a/trunk/drivers/block/floppy.c b/trunk/drivers/block/floppy.c
@@ -671,6 +671,7 @@ static void __reschedule_timeout(int drive, const char *message)
 
 	if (drive == current_reqD)
 		drive = current_drive;
+	__cancel_delayed_work(&fd_timeout);
 
 	if (drive < 0 || drive >= N_DRIVE) {
 		delay = 20UL * HZ;