git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[pandora-kernel.git]
/
drivers
/
ide
/
ide-io.c
diff --git
a/drivers/ide/ide-io.c
b/drivers/ide/ide-io.c
index
999dac0
..
f407784
100644
(file)
--- a/
drivers/ide/ide-io.c
+++ b/
drivers/ide/ide-io.c
@@
-549,8
+549,6
@@
plug_device_2:
if (rq)
blk_requeue_request(q, rq);
if (rq)
blk_requeue_request(q, rq);
- if (!elv_queue_empty(q))
- blk_plug_device(q);
}
void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
}
void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
@@
-562,8
+560,6
@@
void ide_requeue_and_plug(ide_drive_t *drive, struct request *rq)
if (rq)
blk_requeue_request(q, rq);
if (rq)
blk_requeue_request(q, rq);
- if (!elv_queue_empty(q))
- blk_plug_device(q);
spin_unlock_irqrestore(q->queue_lock, flags);
}
spin_unlock_irqrestore(q->queue_lock, flags);
}