projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
block
/
floppy.c
diff --git
a/drivers/block/floppy.c
b/drivers/block/floppy.c
index 9d6ef68e2f1b4433f705d846bd536a47cdaf92d4..a7d6347aaa7913b2a029014a95a2558d8360597e 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;