diff options
| author | Andrzej Jakowski <andrzej.jakowski@intel.com> | 2011-10-27 15:05:42 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2011-10-31 13:23:18 +0400 |
| commit | 7000f7c71e2457391e3249eac1ae53c91f49a8c0 (patch) | |
| tree | bf2567c0d927c691932a701b45bcf17a9a7cfdcc /drivers/scsi/isci/init.c | |
| parent | 52d74634335dfc0984ed955ed3c6ad6488495f96 (diff) | |
| download | blackbird-op-linux-7000f7c71e2457391e3249eac1ae53c91f49a8c0.tar.gz blackbird-op-linux-7000f7c71e2457391e3249eac1ae53c91f49a8c0.zip | |
[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>
Diffstat (limited to 'drivers/scsi/isci/init.c')
| -rw-r--r-- | drivers/scsi/isci/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 43fe840fbe9c..a97edabcb85a 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c @@ -118,7 +118,7 @@ unsigned char phy_gen = 3; module_param(phy_gen, byte, 0); MODULE_PARM_DESC(phy_gen, "PHY generation (1: 1.5Gbps 2: 3.0Gbps 3: 6.0Gbps)"); -unsigned char max_concurr_spinup = 1; +unsigned char max_concurr_spinup; module_param(max_concurr_spinup, byte, 0); MODULE_PARM_DESC(max_concurr_spinup, "Max concurrent device spinup"); |
