diff options
| author | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2012-07-30 03:03:10 -0400 |
| commit | 72ea1f74fcdf874cca6d2c0962379523bbd99e2c (patch) | |
| tree | 4c67be6c73356086ff44ef1b8b1c9479702689ca /drivers/block/floppy.c | |
| parent | b1af9be5ef77898c05667bb9dbf3b180d91d3292 (diff) | |
| parent | a73ff3231df59a4b92ccd0dd4e73897c5822489b (diff) | |
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-3.6/drivers
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 1347ba8b837..8d4afc83e05 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -672,6 +672,7 @@ static void __reschedule_timeout(int drive, const char *message) | |||
| 672 | 672 | ||
| 673 | if (drive == current_reqD) | 673 | if (drive == current_reqD) |
| 674 | drive = current_drive; | 674 | drive = current_drive; |
| 675 | __cancel_delayed_work(&fd_timeout); | ||
| 675 | 676 | ||
| 676 | if (drive < 0 || drive >= N_DRIVE) { | 677 | if (drive < 0 || drive >= N_DRIVE) { |
| 677 | delay = 20UL * HZ; | 678 | delay = 20UL * HZ; |