X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=block%2Fblk-core.c;h=fef79ccb2a118da2f6f3144c993c8338c7205351;hb=0ccd58fc03f40529f66190b1a41e92a732d2bda8;hp=c6e536597c8a824bbe29c6a8ac6296d6d87d1a6b;hpb=e4e0fadcd929138aa82130a1c5f22206d86d7bb2;p=linux-2.6

diff --git a/block/blk-core.c b/block/blk-core.c
index c6e536597c..fef79ccb2a 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1042,15 +1042,9 @@ void blk_put_request(struct request *req)
 	unsigned long flags;
 	struct request_queue *q = req->q;
 
-	/*
-	 * Gee, IDE calls in w/ NULL q.  Fix IDE and remove the
-	 * following if (q) test.
-	 */
-	if (q) {
-		spin_lock_irqsave(q->queue_lock, flags);
-		__blk_put_request(q, req);
-		spin_unlock_irqrestore(q->queue_lock, flags);
-	}
+	spin_lock_irqsave(q->queue_lock, flags);
+	__blk_put_request(q, req);
+	spin_unlock_irqrestore(q->queue_lock, flags);
 }
 EXPORT_SYMBOL(blk_put_request);