diff options
| author | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <anton@tuxera.com> | 2012-02-27 09:01:22 +0000 |
| commit | f621c5334396fd153cd882ea92466823b7e7b821 (patch) | |
| tree | 7b829cad44dc0e5003d7cacac3a7a1b128637083 /drivers/scsi/isci/host.c | |
| parent | 0afa1b62e33250d4777c5803a98ae69fbe872061 (diff) | |
| parent | 500dd2370e77c9551ba298bdeeb91b02d8402199 (diff) | |
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'drivers/scsi/isci/host.c')
| -rw-r--r-- | drivers/scsi/isci/host.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 1a65d6514237..418391b1c361 100644 --- a/drivers/scsi/isci/host.c +++ b/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; |