From 0624ff3c0ef568b7deaa95a5f75e9853de91a512 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Tue, 22 Jun 2010 13:42:02 +0200 Subject: [PATCH] --- yaml --- r: 204177 b: refs/heads/master c: 24ae163ed33d2b8a70d2f0b1947b401d0a8e8719 h: refs/heads/master i: 204175: dd257a1a84bd6f61762ef572c059f1b07ae96727 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/mvsas/mv_sas.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bd676b5dc0b4..01194804d602 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 97009a29e8c999def2d1e9ef253c226daf9541af +refs/heads/master: 24ae163ed33d2b8a70d2f0b1947b401d0a8e8719 diff --git a/trunk/drivers/scsi/mvsas/mv_sas.c b/trunk/drivers/scsi/mvsas/mv_sas.c index f5e321791903..cab924239862 100644 --- a/trunk/drivers/scsi/mvsas/mv_sas.c +++ b/trunk/drivers/scsi/mvsas/mv_sas.c @@ -1640,7 +1640,7 @@ int mvs_abort_task(struct sas_task *task) struct mvs_tmf_task tmf_task; struct domain_device *dev = task->dev; struct mvs_device *mvi_dev = (struct mvs_device *)dev->lldd_dev; - struct mvs_info *mvi = mvi_dev->mvi_info; + struct mvs_info *mvi; int rc = TMF_RESP_FUNC_FAILED; unsigned long flags; u32 tag; @@ -1650,6 +1650,8 @@ int mvs_abort_task(struct sas_task *task) rc = TMF_RESP_FUNC_FAILED; } + mvi = mvi_dev->mvi_info; + spin_lock_irqsave(&task->task_state_lock, flags); if (task->task_state_flags & SAS_TASK_STATE_DONE) { spin_unlock_irqrestore(&task->task_state_lock, flags);