[SCSI] aacraid: prevent panic on adapter resource failure
authorSalyzyn, Mark <mark_salyzyn@adaptec.com>
Thu, 2 Aug 2007 19:38:59 +0000 (15:38 -0400)
committerJames Bottomley <jejb@mulgrave.localdomain>
Sat, 4 Aug 2007 14:46:43 +0000 (09:46 -0500)
If the driver fails to allocate the contiguous (DMAable) memory for
system reasons, we fail to load the instance, but then we try to free
the <nul> allocation in the cleanup code and we get a panic in
pci_free_consistent(). This is reported against an older kernel, hope
this is relevant for latest/greatest.

Signed-off-by: Mark Salyzyn <aacraid@adaptec.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/scsi/aacraid/linit.c

index 813556c60007de5c1e1afde58c721048b34fa58a..a7f42a17b5c708ba331b59874690f8a84cdab920 100644 (file)
@@ -1110,7 +1110,9 @@ static int __devinit aac_probe_one(struct pci_dev *pdev,
        __aac_shutdown(aac);
  out_unmap:
        aac_fib_map_free(aac);
-       pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr, aac->comm_phys);
+       if (aac->comm_addr)
+               pci_free_consistent(aac->pdev, aac->comm_size, aac->comm_addr,
+                 aac->comm_phys);
        kfree(aac->queues);
        aac_adapter_ioremap(aac, 0);
        kfree(aac->fibs);