Linus Torvalds
dab058fd5f
floppy: cancel any pending fd_timeouts before adding a new one
...
In commit 070ad7e793 ("floppy: convert to delayed work and
single-thread wq") the 'fd_timeout' timer was converted to a delayed
work. However, the "del_timer(&fd_timeout)" was lost in the process,
and any previous pending timeouts would stay active when we then
re-queued the timeout.
This resulted in the floppy probe sequence having a (stale) 20s timeout
rather than the intended 3s timeout, and thus made booting with the
floppy driver (but no actual floppy controller) take much longer than it
should.
Of course, there's little reason for most people to compile the floppy
driver into the kernel at all, which is why most people never noticed.
Canceling the delayed work where we used to do the del_timer() fixes the
issue, and makes the floppy probing use the proper new timeout instead.
The three second timeout is still very wasteful, but better than the 20s
one.
Reported-and-tested-by: Andi Kleen <ak@linux.intel.com>
Reported-and-tested-by: Calvin Walton <calvin.walton@kepstin.ca>
Cc: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-03 15:51:22 -07:00
..
aoe
switch device_get_devnode() and ->devnode() to umode_t *
2012-01-03 22:54:55 -05:00
drbd
Merge branch 'for-jens' of git://git.drbd.org/linux-drbd into for-linus
2012-06-13 21:19:42 +02:00
mtip32xx
mtip32xx: Create debugfs entries for troubleshooting
2012-06-05 09:13:49 +02:00
paride
paride/pcd: fix bool verbose module parameter.
2012-01-13 09:32:26 +10:30
xen-blkback
Merge branch 'stable/for-jens-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
2012-06-13 21:19:06 +02:00
amiflop.c
fs: move code out of buffer.c
2012-01-03 22:54:07 -05:00
ataflop.c
brd.c
block: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:16 +08:00
cciss.c
block: add and use scsi_blk_cmd_ioctl
2012-01-14 15:07:24 -08:00
cciss.h
cciss: Adds simple mode functionality
2011-08-08 11:40:15 +02:00
cciss_cmd.h
cciss: use new doorbell-bit-5 reset method
2011-05-06 08:23:55 -06:00
cciss_scsi.c
cciss: Fix scsi tape io with more than 255 scatter gather elements
2012-03-22 21:40:09 +01:00
cciss_scsi.h
cciss: add cciss_tape_cmds module paramter
2011-05-06 08:23:59 -06:00
cpqarray.c
drivers/block/cpqarray.c: use pci_dev->revision
2011-09-21 10:02:13 +02:00
cpqarray.h
cryptoloop.c
DAC960.c
dac960: Remove unused variables from DAC960_CreateProcEntries()
2012-05-11 16:42:14 +02:00
DAC960.h
floppy.c
floppy: cancel any pending fd_timeouts before adding a new one
2012-07-03 15:51:22 -07:00
hd.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ida_cmd.h
ida_ioctl.h
Kconfig
usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
2012-03-16 13:30:10 -07:00
loop.c
block: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:16 +08:00
Makefile
Merge git://git.infradead.org/users/willy/linux-nvme
2012-01-18 12:34:09 -08:00
mg_disk.c
nbd.c
Merge branch 'akpm' (Andrew's patch-bomb)
2012-03-28 17:19:28 -07:00
nvme.c
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-03-20 21:12:50 -07:00
osdblk.c
pktcdvd.c
block: remove the second argument of k[un]map_atomic()
2012-03-20 21:48:16 +08:00
ps3disk.c
block: Fix files that are modules and hence need module.h
2011-10-31 19:31:13 -04:00
ps3vram.c
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
rbd.c
rbd: rename __rbd_update_snaps to __rbd_refresh_header
2012-05-14 12:13:09 -05:00
rbd_types.h
rbd: small changes
2012-03-22 10:47:50 -05:00
smart1,2.h
sunvdc.c
powerpc+sparc/vio: Modernize driver registration
2012-03-28 11:33:24 +11:00
swim.c
m68k/mac: cleanup forward declarations
2011-12-10 19:52:46 +01:00
swim3.c
block/swim3: Locking fixes
2011-12-12 12:42:12 +01:00
swim_asm.S
sx8.c
block, sx8: fix pointer math issue getting fw version
2012-03-03 19:44:39 +01:00
ub.c
usb/ub: deprecate & schedule for removal the "Low Performance USB Block" driver
2012-03-16 13:30:10 -07:00
umem.c
umem: fix up unplugging
2012-06-13 21:17:21 +02:00
umem.h
virtio_blk.c
virtio_blk: Drop unused request tracking list
2012-05-22 12:16:14 +09:30
xd.c
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
xd.h
xen-blkfront.c
xen/blkfront: Add WARN to deal with misbehaving backends.
2012-06-12 08:29:04 -04:00
xsysace.c
block: xsysace: Don't use NO_IRQ
2012-01-05 08:34:29 +01:00
z2ram.c