Commit 6d70a74f authored Jun 22, 2012 by Dan Williams

isci: fix isci_pci_probe() generates warning on efi failure path



The oem parameter image embedded in the efi variable is at an offset
from the start of the variable.  However, in the failure path we try to
free the 'orom' pointer which is only valid when the paramaters are
being read from the legacy option-rom space.

Since failure to load the oem parameters is unlikely and we keep the
memory around in the success case just defer all de-allocation to devm.

Cc: <stable@vger.kernel.org>
Reported-by: Don Morris <don.morris@hp.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

parent f8f5701b

drivers/scsi/isci/init.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -641,7 +641,6 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic
		orom->hdr.version)) {
		dev_warn(&pdev->dev,
		"[%d]: invalid oem parameters detected, falling back to firmware\n", i);
		devm_kfree(&pdev->dev, orom);
		orom = NULL;
		break;
		}

drivers/scsi/isci/probe_roms.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -104,7 +104,6 @@ struct isci_orom isci_request_oprom(struct pci_dev pdev)

		if (i >= len) {
		dev_err(&pdev->dev, "oprom parse error\n");
		devm_kfree(&pdev->dev, rom);
		rom = NULL;
		}
		pci_unmap_biosrom(oprom);

Admin message