diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-09 07:07:12 +0100 |
commit | a892acacd3a8546ac161526522f13b5174f2c471 (patch) | |
tree | ee6d36f27f1388989ebfcabf90253fb7194112ac /drivers/scsi/arm/queue.c | |
parent | [libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines (diff) | |
parent | [PATCH] Fix sysctl unregistration oops (CVE-2005-2709) (diff) | |
download | linux-a892acacd3a8546ac161526522f13b5174f2c471.tar.xz linux-a892acacd3a8546ac161526522f13b5174f2c471.zip |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/arm/queue.c')
-rw-r--r-- | drivers/scsi/arm/queue.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/arm/queue.c b/drivers/scsi/arm/queue.c index e6d159270d29..b10750bb5c09 100644 --- a/drivers/scsi/arm/queue.c +++ b/drivers/scsi/arm/queue.c @@ -91,8 +91,7 @@ void queue_free (Queue_t *queue) { if (!list_empty(&queue->head)) printk(KERN_WARNING "freeing non-empty queue %p\n", queue); - if (queue->alloc) - kfree(queue->alloc); + kfree(queue->alloc); } |