diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-10-12 21:13:59 +0400 |
| commit | fa8c4bd898c720c5a2186c9c8cb7cf80885aa6df (patch) | |
| tree | 4f70fd5bae3a6e895b96e3dcca4a26c9917ebd9b /drivers/scsi/isci | |
| parent | 99542137b908ab89180986de6fb75532ad765688 (diff) | |
| parent | c6092bb74442d4ee1dfea60e2934915836f53528 (diff) | |
Merge branch 'tracking-linux-3.6.y' into merge-linux-linaro-core-trackingllct-20121012.0linux-linaro-core-tracking-3.6-2012.10
Diffstat (limited to 'drivers/scsi/isci')
| -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 92c1d86d1fc6..1286a8a787e2 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -644,7 +644,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); |