Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / scsi / arm / queue.c

diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c
index b10750b..8caa590 100644 (file)
--- a/drivers/scsi/arm/queue.c
+++ b/drivers/scsi/arm/queue.c
@@ -118,8 +118,7 @@ int __queue_add(Queue_t *queue, Scsi_Cmnd *SCpnt, int head)
        list_del(l);
 
        q = list_entry(l, QE_t, list);
-       if (BAD_MAGIC(q, QUEUE_MAGIC_FREE))
-               BUG();
+       BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_FREE));
 
        SET_MAGIC(q, QUEUE_MAGIC_USED);
        q->SCpnt = SCpnt;
@@ -144,8 +143,7 @@ static Scsi_Cmnd *__queue_remove(Queue_t *queue, struct list_head *ent)
         */
        list_del(ent);
        q = list_entry(ent, QE_t, list);
-       if (BAD_MAGIC(q, QUEUE_MAGIC_USED))
-               BUG();
+       BUG_ON(BAD_MAGIC(q, QUEUE_MAGIC_USED));
 
        SET_MAGIC(q, QUEUE_MAGIC_FREE);
        list_add(ent, &queue->free);