lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] aic94xx: Free scsi host on error

Browse Source 
If an error occurred during initialisation, we would sometimes fail to
call scsi_host_put() and thus end up with a leaked scsi_host.  It was
also possible to miss calling scsi_remove_host().

Signed-off-by: Matthew Wilcox <matthew@wil.cx>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
This commit is contained in:
Matthew Wilcox
2007-08-15 12:56:55 -06:00
committed by James Bottomley
parent a60ebc52cb
commit f01abb362f
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/aic94xx/aic94xx_init.c
View File

@@ -583,7 +583,7 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
asd_ha = kzalloc(sizeof(*asd_ha), GFP_KERNEL); asd_ha = kzalloc(sizeof(*asd_ha), GFP_KERNEL);
if (!asd_ha) { if (!asd_ha) {
asd_printk("out of memory\n"); asd_printk("out of memory\n");
goto Err; goto Err_put;
} }
asd_ha->pcidev = dev; asd_ha->pcidev = dev;
asd_ha->sas_ha.dev = &asd_ha->pcidev->dev; asd_ha->sas_ha.dev = &asd_ha->pcidev->dev;
@@ -600,14 +600,12 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
shost->max_cmd_len = 16; shost->max_cmd_len = 16;
err = scsi_add_host(shost, &dev->dev); err = scsi_add_host(shost, &dev->dev);
if (err) { if (err)
scsi_host_put(shost);
goto Err_free; goto Err_free;
}
err = asd_dev->setup(asd_ha); err = asd_dev->setup(asd_ha);
if (err) if (err)
goto Err_free; goto Err_remove;
err = -ENODEV; err = -ENODEV;
if (!pci_set_dma_mask(dev, DMA_64BIT_MASK) if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)
@@ -618,14 +616,14 @@ static int __devinit asd_pci_probe(struct pci_dev *dev,
; ;
else { else {
asd_printk("no suitable DMA mask for %s\n", pci_name(dev)); asd_printk("no suitable DMA mask for %s\n", pci_name(dev));
goto Err_free; goto Err_remove;
} }
pci_set_drvdata(dev, asd_ha); pci_set_drvdata(dev, asd_ha);
err = asd_map_ha(asd_ha); err = asd_map_ha(asd_ha);
if (err) if (err)
goto Err_free; goto Err_remove;
err = asd_create_ha_caches(asd_ha); err = asd_create_ha_caches(asd_ha);
if (err) if (err)
@@ -692,9 +690,12 @@ Err_free_cache:
asd_destroy_ha_caches(asd_ha); asd_destroy_ha_caches(asd_ha);
Err_unmap: Err_unmap:
asd_unmap_ha(asd_ha); asd_unmap_ha(asd_ha);
Err_remove:
scsi_remove_host(shost);
Err_free: Err_free:
kfree(asd_ha); kfree(asd_ha);
scsi_remove_host(shost); Err_put:
scsi_host_put(shost);
Err: Err:
pci_disable_device(dev); pci_disable_device(dev);
return err; return err;