X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fblock%2Fdeadline-iosched.c;h=52a3ae5289a09a7af79081df5de2ec7e4c40ff26;hb=ddbf9ef385bfbef897210733abfb73cb9b94ecec;hp=24594c57c3230e5a095eb10ddb282137ed9161ba;hpb=64e47488c913ac704d465a6af86a26786d1412a5;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index 24594c57c32..52a3ae5289a 100644
--- 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" */