diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-04-26 20:19:53 (GMT) |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2011-07-03 11:00:38 (GMT) |
| commit | d37ee7e89a98a583d45fbc8bdd1943cbaf642fd0 (patch) | |
| tree | 52a61f9f6f51860a088c19273cfb7a8f3a22b04b /drivers/scsi/isci/init.c | |
| parent | 3d6e428c0cd8d234bab0ac93aff9ccffacc8bc7e (diff) | |
| download | linux-fsl-qoriq-d37ee7e89a98a583d45fbc8bdd1943cbaf642fd0.tar.xz | |
isci: allow fallback to option-rom if efi variable retrieval fails
If the scu efi driver is disabled but the option-rom is enabled (during an efi
boot) allow the code to fallback to scanning legacy option-rom space for the
parameters.
Reported-by: Yinghai Lu <yinghai.lu@oracle.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/init.c')
| -rw-r--r-- | drivers/scsi/isci/init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index f7ca9e8..10b60ab 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -475,7 +475,7 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic int err, i; struct isci_host *isci_host; const struct firmware *fw = NULL; - struct isci_orom *orom; + struct isci_orom *orom = NULL; char *source = "(platform)"; check_si_rev(pdev); @@ -487,7 +487,8 @@ static int __devinit isci_pci_probe(struct pci_dev *pdev, const struct pci_devic if (efi_enabled) orom = isci_get_efi_var(pdev); - else + + if (!orom) orom = isci_request_oprom(pdev); for (i = 0; orom && i < ARRAY_SIZE(orom->ctrl); i++) { |