From 292b8c9e9c0915b4b11e3762145020892e526b69 Mon Sep 17 00:00:00 2001 From: adam radford Date: Mon, 1 Oct 2012 19:27:12 -0700 Subject: [PATCH] --- yaml --- r: 334134 b: refs/heads/master c: e187df63991b1b50af0fd3cf8ceaf9aa77c20f4a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b9dba6d85d9c..eeceb37c836b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f9eff81584ce8727ac6d4dc418f546337781943b +refs/heads/master: e187df63991b1b50af0fd3cf8ceaf9aa77c20f4a diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c index 31d397497c45..ad6e2ac196b0 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/trunk/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -1508,7 +1508,8 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance, local_map_ptr = fusion->ld_map[(instance->map_id & 1)]; /* Check if this is a system PD I/O */ - if (instance->pd_list[pd_index].driveState == MR_PD_STATE_SYSTEM) { + if (scmd->device->channel < MEGASAS_MAX_PD_CHANNELS && + instance->pd_list[pd_index].driveState == MR_PD_STATE_SYSTEM) { io_request->Function = 0; io_request->DevHandle = local_map_ptr->raidMap.devHndlInfo[device_id].curDevHdl;