From: Andrzej Jakowski Date: Thu, 27 Oct 2011 22:05:42 +0000 (-0700) Subject: [SCSI] isci: overriding max_concurr_spinup oem parameter by max(oem, user) X-Git-Tag: v3.2-rc1~44^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7000f7c71e2457391e3249eac1ae53c91f49a8c0;p=pandora-kernel.git [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 Signed-off-by: Dan Williams Signed-off-by: James Bottomley --- Reading git-diff-tree failed