From 62af5f650b58328a5bee866ec9f66b31d7d0507e Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 3 Jul 2012 15:51:22 -0700
Subject: [PATCH] --- yaml --- r: 311603 b: refs/heads/master c:
 dab058fd5ff834cb3b9de1d930ce731a605eb0c6 h: refs/heads/master i:   311601:
 f7f3131260285d88bb7f0148362343c8e8ecdecb   311599:
 28113470f2ca3e1a06f3fe98ca119f7632a08a4c v: v3

---
 [refs]                       | 2 +-
 trunk/drivers/block/floppy.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ef2bc681c672..5f03bdca50bb 100644
--- 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
index cce7df367b79..553f43a90953 100644
--- 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;