diff --git a/[refs] b/[refs] index 008023991efc..799451280241 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d79c5a670ddf076a346ddcf3d9e21785ecab963f +refs/heads/master: 52a93ba815737e3877f85b46850cffe993a22429 diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c index 1905aaba49fb..ac83cf9a19ae 100644 --- a/trunk/block/blk-core.c +++ b/trunk/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);