diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 10:26:10 +0200 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-13 10:26:10 +0200 |
| commit | 1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (patch) | |
| tree | c4ecdf7a4199bc20adcef950e9d5a38b9a6dc392 /drivers/scsi/isci/probe_roms.c | |
| parent | Merge branch 'for-3.6-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| parent | isci: add a couple __iomem annotations (diff) | |
| download | linux-1c4cf1d5845b59cdcbfad8e67272cf5b219ab062.tar.xz linux-1c4cf1d5845b59cdcbfad8e67272cf5b219ab062.zip | |
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/probe_roms.c')
| -rw-r--r-- | drivers/scsi/isci/probe_roms.c | 1 |
1 files changed, 0 insertions, 1 deletions
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); |