From cf0c51e1e191e4959d8cf0f80a7fc566d57dccb8 Mon Sep 17 00:00:00 2001 From: adam radford Date: Thu, 13 Oct 2011 16:01:12 -0700 Subject: [PATCH] --- yaml --- r: 271143 b: refs/heads/master c: f575c5d3ebdca3b0482847d8fcba971767754a9e h: refs/heads/master i: 271141: c317cdd0dae4fdc0da9ac16ebe8f793850d43ee5 271139: ada6df353d70226992bff9341457414714abdf2a 271135: e7c3fd2651926171b152aa5de22c3b91312f967b v: v3 --- [refs] | 2 +- trunk/drivers/scsi/megaraid/megaraid_sas_base.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6a7ce7846b7f..9fa852bd69c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fba63097b8614a4a158226c02eec0318f41cd24f +refs/heads/master: f575c5d3ebdca3b0482847d8fcba971767754a9e diff --git a/trunk/drivers/scsi/megaraid/megaraid_sas_base.c b/trunk/drivers/scsi/megaraid/megaraid_sas_base.c index 8d587cb73cb7..29a994f9c4f1 100644 --- a/trunk/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/trunk/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1914,7 +1914,6 @@ static int megasas_generic_reset(struct scsi_cmnd *scmd) static enum blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd) { - struct megasas_cmd *cmd = (struct megasas_cmd *)scmd->SCp.ptr; struct megasas_instance *instance; unsigned long flags; @@ -1923,7 +1922,7 @@ blk_eh_timer_return megasas_reset_timer(struct scsi_cmnd *scmd) return BLK_EH_NOT_HANDLED; } - instance = cmd->instance; + instance = (struct megasas_instance *)scmd->device->host->hostdata; if (!(instance->flag & MEGASAS_FW_BUSY)) { /* FW is busy, throttle IO */ spin_lock_irqsave(instance->host->host_lock, flags);