Skip to content

Commit

Permalink
isci: allow fallback to option-rom if efi variable retrieval fails
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dan Williams committed Jul 3, 2011
1 parent 3d6e428 commit d37ee7e
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/scsi/isci/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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++) {
Expand Down

0 comments on commit d37ee7e

Please sign in to comment.