diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2012-06-22 20:31:14 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-07-03 21:09:30 +0200 |
| commit | 6d70a74ffd616073a68ae0974d98819bfa8e6da6 (patch) | |
| tree | 5ad1db7feeabb7eb5bc6154f6a60db9ba5463167 | |
| parent | Linux 3.5-rc1 (diff) | |
| download | linux-6d70a74ffd616073a68ae0974d98819bfa8e6da6.tar.xz linux-6d70a74ffd616073a68ae0974d98819bfa8e6da6.zip | |
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>
| -rw-r--r-- | drivers/scsi/isci/init.c | 1 | ||||
| -rw-r--r-- | drivers/scsi/isci/probe_roms.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 47e28b555029..8870bd3b6383 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -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; } diff --git a/drivers/scsi/isci/probe_roms.c b/drivers/scsi/isci/probe_roms.c index 4d95654c3fd4..8ac646e5eddc 100644 --- a/drivers/scsi/isci/probe_roms.c +++ b/drivers/scsi/isci/probe_roms.c @@ -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); |