diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 10:45:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-04-08 10:45:36 -0400 |
| commit | cf90bfe2ebaf9d32f37acbebb7425c280fd6cd30 (patch) | |
| tree | d3e3f2067dc423721d698d154e15213aa5b0132d /drivers/ide/ide-io.c | |
| parent | 0a2851b9a837cb025d48bb8118f35ebd12bce4b5 (diff) | |
| parent | 720fc22a7af79d91ec460c80efa92c65c12d105e (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6:
ide: Fix IDE taskfile with cfq scheduler
ide: Must hold queue lock when requeueing
ide: Requeue request after DMA timeout
Diffstat (limited to 'drivers/ide/ide-io.c')
| -rw-r--r-- | drivers/ide/ide-io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index db96138fefcd..172ac9218154 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
| @@ -566,7 +566,7 @@ plug_device_2: | |||
| 566 | blk_plug_device(q); | 566 | blk_plug_device(q); |
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | static void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) | 569 | void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq) |
| 570 | { | 570 | { |
| 571 | struct request_queue *q = drive->queue; | 571 | struct request_queue *q = drive->queue; |
| 572 | unsigned long flags; | 572 | unsigned long flags; |