From f1ce3c4db952c9fd0f69719edb6eace242802aaa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Tue, 26 Apr 2011 13:19:53 -0700 Subject: [PATCH] --- yaml --- r: 254428 b: refs/heads/master c: d37ee7e89a98a583d45fbc8bdd1943cbaf642fd0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/init.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dd811cda8a84..1c1dfbc26c12 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d6e428c0cd8d234bab0ac93aff9ccffacc8bc7e +refs/heads/master: d37ee7e89a98a583d45fbc8bdd1943cbaf642fd0 diff --git a/trunk/drivers/scsi/isci/init.c b/trunk/drivers/scsi/isci/init.c index f7ca9e8d9146..10b60ab261e1 100644 --- a/trunk/drivers/scsi/isci/init.c +++ b/trunk/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++) {