linux 2.6.16.38 w/ vs2.0.3-rc1

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

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