Merge to Fedora kernel-2.6.7-1.492

[linux-2.6.git] / drivers / block / elevator.c

diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c
index da60f83..35c9385 100644 (file)
--- a/drivers/block/elevator.c
+++ b/drivers/block/elevator.c
@@ -211,7 +211,7 @@ struct request *elv_next_request(request_queue_t *q)
        struct request *rq;
        int ret;
 
-       while ((rq = __elv_next_request(q))) {
+       while ((rq = __elv_next_request(q)) != NULL) {
                /*
                 * just mark as started even if we don't start it, a request
                 * that has been delayed should not be passed by new incoming