Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers

[firefly-linux-kernel-4.4.55.git] / drivers / block / floppy.c

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 1347ba8b83775e0e8a21423958225d96a0b27e99..8d4afc83e05fc52bc7db069f9911154c0fca914f 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -672,6 +672,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;