From: Julia Lawall <Julia.Lawall@xxxxxxx> Move the add_timer below some instructions that do not seem to require a timer and that in one case can fail, thus avoiding the need for a corresponding del_timer. Signed-off-by: Julia Lawall <Julia.Lawall@xxxxxxx> --- I don't fully understand the code, and have not tested the change. Think of this patch as more of a question as to whether this is the right thing to do. drivers/scsi/pm8001/pm8001_sas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 6b5b4a2..72cbe6d 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c @@ -775,8 +775,6 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, task->slow_task->timer.data = (unsigned long)task; task->slow_task->timer.function = pm8001_tmf_timedout; task->slow_task->timer.expires = jiffies + PM8001_TASK_TIMEOUT * HZ; - add_timer(&task->slow_task->timer); - res = pm8001_tag_alloc(pm8001_ha, &ccb_tag); if (res) return res; @@ -785,6 +783,8 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, ccb->ccb_tag = ccb_tag; ccb->task = task; + add_timer(&task->slow_task->timer); + res = PM8001_CHIP_DISP->task_abort(pm8001_ha, pm8001_dev, flag, task_tag, ccb_tag); -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
