[SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)
authorAndrzej Jakowski <andrzej.jakowski@intel.com>
Thu, 27 Oct 2011 22:05:42 +0000 (15:05 -0700)
committerJames Bottomley <JBottomley@Parallels.com>
Mon, 31 Oct 2011 09:23:18 +0000 (13:23 +0400)
commit7000f7c71e2457391e3249eac1ae53c91f49a8c0
treebf2567c0d927c691932a701b45bcf17a9a7cfdcc
parent52d74634335dfc0984ed955ed3c6ad6488495f96
[SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user)

Fixes bug where max_concurr_spinup oem parameter should be
overriden by max_concurr_spinup user parameter. Override should
happen only when max_concurr_spinup user parameter is specified
in command line (greater than 0). Also this fix shortens variables
representing max_conxurr_spinup for oem and user parameters.

Signed-off-by: Andrzej Jakowski <andrzej.jakowski@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
drivers/scsi/isci/host.c
drivers/scsi/isci/init.c
drivers/scsi/isci/probe_roms.h