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

Commit 653c42d5 authored by Tomas Henzl's avatar Tomas Henzl Committed by James Bottomley
Browse files

[SCSI] mptfusion: release resources in error return path 



We should release the resources in error return code path.
The requested pci bars should be released under an error condition,
when mpt_mapresources fails.

Signed-off-by: default avatarTomas Henzl <thenzl@redhat.com>
Acked-by: default avatar"Desai, Kashyap" <Kashyap.Desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 943a2df8

drivers/message/fusion/mptbase.c

+3 −0
Original line number Diff line number Diff line
@@ -1635,6 +1635,7 @@ mpt_mapresources(MPT_ADAPTER *ioc) 
		} else {

			printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",

			    ioc->name, pci_name(pdev));

			pci_release_selected_regions(pdev, ioc->bars);

			return r;

		}

	} else {
@@ -1648,6 +1649,7 @@ mpt_mapresources(MPT_ADAPTER *ioc) 
		} else {

			printk(MYIOC_s_WARN_FMT "no suitable DMA mask for %s\n",

			    ioc->name, pci_name(pdev));

			pci_release_selected_regions(pdev, ioc->bars);

			return r;

		}

	}
@@ -1678,6 +1680,7 @@ mpt_mapresources(MPT_ADAPTER *ioc) 
	if (mem == NULL) {

		printk(MYIOC_s_ERR_FMT ": ERROR - Unable to map adapter"

			" memory!\n", ioc->name);

		pci_release_selected_regions(pdev, ioc->bars);

		return -EINVAL;

	}

	ioc->memmap = mem;