From 6221839601bcb8a6ac4f9429d757c7c1385f0bb9 Mon Sep 17 00:00:00 2001
From: Dave Jiang <dave.jiang@intel.com>
Date: Fri, 27 Jan 2012 11:17:37 -0800
Subject: [PATCH] --- yaml --- r: 287916 b: refs/heads/master c:
 6d7938f46f89c9773f9396c1d13b20bbc5c6d95b h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/scsi/isci/host.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e2b92deb6279..190e2d41624f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a92fa25c63a788758bd52e9123504d133210c8b7
+refs/heads/master: 6d7938f46f89c9773f9396c1d13b20bbc5c6d95b
diff --git a/trunk/drivers/scsi/isci/host.c b/trunk/drivers/scsi/isci/host.c
index 1a65d6514237..418391b1c361 100644
--- a/trunk/drivers/scsi/isci/host.c
+++ b/trunk/drivers/scsi/isci/host.c
@@ -1848,9 +1848,11 @@ static enum sci_status sci_oem_parameters_set(struct isci_host *ihost)
 	if (state == SCIC_RESET ||
 	    state == SCIC_INITIALIZING ||
 	    state == SCIC_INITIALIZED) {
+		u8 oem_version = pci_info->orom ? pci_info->orom->hdr.version :
+			ISCI_ROM_VER_1_0;
 
 		if (sci_oem_parameters_validate(&ihost->oem_parameters,
-						pci_info->orom->hdr.version))
+						oem_version))
 			return SCI_FAILURE_INVALID_PARAMETER_VALUE;
 
 		return SCI_SUCCESS;