diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-31 08:01:13 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-08-31 08:01:13 -0700 |
| commit | 766f012eb5f33bdfa710442453d6d93079d3c1de (patch) | |
| tree | 2d8672f84516f2e35967293a495315ac4239424e | |
| parent | 1016206390a89aa1aae6565ee85cadfa822b9f8a (diff) | |
De-queue the floppy request late, so that the higher levels
know the floppy driver is busy.
| -rw-r--r-- | drivers/block/floppy.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 8698892554d8..0e222083baa5 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -2299,12 +2299,11 @@ static inline void end_request(struct request *req, int uptodate) return; add_blkdev_randomness(major(dev)); floppy_off(DEVICE_NR(dev)); + blkdev_dequeue_request(req); end_that_request_last(req); /* Get the next request */ req = elv_next_request(QUEUE); - if (req) - blkdev_dequeue_request(req); CURRENT = req; } @@ -2939,7 +2938,6 @@ static void redo_fd_request(void) unlock_fdc(); return; } - blkdev_dequeue_request(req); CURRENT = req; } if (major(CURRENT->rq_dev) != MAJOR_NR) |