Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Hocko <mhocko@suse.cz>2012-10-08 10:43:36 +0200
committerJiri Kosina <jkosina@suse.cz>2012-10-09 13:58:45 +0200
commit80c422cdf682c7f4345f3ad848b76c8ff876d40b (patch)
treefcbbf8c59b06cd0c52adb94840f5ed26c1dc3f40
parent6cb8ce3ad07ec7a7e28600c673f8d2e7c1cf6ef5 (diff)
- patches.drivers/megaraid-sas-boot-hangs-while-LD-is-offline.patch:rpm-3.0.42-0.7
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_base.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c
index ad2cb209b5f8..82cd5a876dd7 100644
--- a/drivers/scsi/megaraid/megaraid_sas_base.c
+++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -1534,7 +1534,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
* That will be fixed once LSI engineers have audited the
* firmware for possible issues.
*/
- pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev_id;
+ pd_index = (sdev->channel * MEGASAS_MAX_DEV_PER_CHANNEL) + sdev->id;
/* Skip for LD offline and PD which are not configured as
* system pd.
@@ -1547,7 +1547,7 @@ static int megasas_slave_configure(struct scsi_device *sdev)
}
ld_index = ((sdev->channel - 2) * MEGASAS_MAX_DEV_PER_CHANNEL)
- + sdev_id;
+ + sdev->id;
/* Need to find out best value to detect LD */
if ((sdev->channel >= MEGASAS_MAX_LD_CHANNELS) &&
(instance->ld_ids[ld_index] == 0xFF)) {