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 master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
block
/
deadline-iosched.c
diff --git
a/drivers/block/deadline-iosched.c
b/drivers/block/deadline-iosched.c
index
24594c5
..
52a3ae5
100644
(file)
--- a/
drivers/block/deadline-iosched.c
+++ b/
drivers/block/deadline-iosched.c
@@
-512,7
+512,10
@@
static int deadline_dispatch_requests(struct deadline_data *dd)
/*
* batches are currently reads XOR writes
*/
- drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
+ if (dd->next_drq[WRITE])
+ drq = dd->next_drq[WRITE];
+ else
+ drq = dd->next_drq[READ];
if (drq) {
/* we have a "next request" */