diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 09:26:10 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 09:26:10 +0100 |
| commit | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (patch) | |
| tree | c4ecdf7a4199bc20adcef950e9d5a38b9a6dc392 /drivers/scsi/isci/init.c | |
| parent | 0bd1189e239c76eb3a50e458548fbe7e4a5dfff1 (diff) | |
| parent | 6734092e66011def7875bd67beef889d0fee1cc9 (diff) | |
Merge tag 'isci-for-3.6' into for-next
isci update for 3.6
1/ Fix the workaround for drives that have a slow response to COMSAS.
Drives with this problem intermittently take a long time to be
identified, or fail to be identified altogether.
2/ A minor fix for the efi variable code failure path
3/ A handful of smatch fixups from Dan Carpenter
Diffstat (limited to 'drivers/scsi/isci/init.c')
| -rw-r--r-- | drivers/scsi/isci/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 92c1d86d1fc..1286a8a787e 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; } |