Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e61b17fd authored by Mark Haverkamp's avatar Mark Haverkamp Committed by James Bottomley
Browse files

[SCSI] aacraid: Error path cleanup 



Received from Mark Salyzyn

Some of the error return paths during initialization resulted in a zero
report to caller

Signed-off-by: default avatarMark Haverkamp <markh@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 31876f32

drivers/scsi/aacraid/linit.c

+3 −2
Original line number Diff line number Diff line
@@ -800,10 +800,11 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	error = pci_enable_device(pdev);

	if (error)

		goto out;

	error = -ENODEV;



	if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || 

			pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))

		goto out;

		goto out_disable_pdev;

	/*

	 * If the quirk31 bit is set, the adapter needs adapter

	 * to driver communication memory to be allocated below 2gig
@@ -811,7 +812,7 @@ static int __devinit aac_probe_one(struct pci_dev *pdev, 
	if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) 

		if (pci_set_dma_mask(pdev, DMA_31BIT_MASK) ||

				pci_set_consistent_dma_mask(pdev, DMA_31BIT_MASK))

			goto out;

			goto out_disable_pdev;

	

	pci_set_master(pdev);