From: Dan Williams Date: Tue, 26 Apr 2011 20:19:53 +0000 (-0700) Subject: isci: allow fallback to option-rom if efi variable retrieval fails X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d37ee7e89a98a583d45fbc8bdd1943cbaf642fd0;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git 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 Signed-off-by: Dan Williams --- diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index f7ca9e8d9146..10b60ab261e1 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++) {