iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

isci: Device access in the error path does not depend on IDEV_GONE.

Browse Source 
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Jeff Skirvin
2012-03-08 22:41:55 -08:00
committed by Dan Williams
parent 59e3539643
commit 637325028f
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/isci/task.c
View File

@ -427,7 +427,7 @@ int isci_task_lu_reset(struct domain_device *dev, u8 *lun)
int ret; int ret;
spin_lock_irqsave(&ihost->scic_lock, flags); spin_lock_irqsave(&ihost->scic_lock, flags);
idev = isci_lookup_device(dev); idev = isci_get_device(dev->lldd_dev);
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
dev_dbg(&ihost->pdev->dev, dev_dbg(&ihost->pdev->dev,
@ -507,7 +507,7 @@ int isci_task_abort_task(struct sas_task *task)
if (!(task->task_state_flags & SAS_TASK_STATE_DONE) && if (!(task->task_state_flags & SAS_TASK_STATE_DONE) &&
(task->task_state_flags & SAS_TASK_AT_INITIATOR) && (task->task_state_flags & SAS_TASK_AT_INITIATOR) &&
old_request) old_request)
idev = isci_lookup_device(task->dev); idev = isci_get_device(task->dev->lldd_dev);
spin_unlock(&task->task_state_lock); spin_unlock(&task->task_state_lock);
spin_unlock_irqrestore(&ihost->scic_lock, flags); spin_unlock_irqrestore(&ihost->scic_lock, flags);
@ -593,6 +593,9 @@ int isci_task_abort_task(struct sas_task *task)
ISCI_ABORT_TASK_TIMEOUT_MS); ISCI_ABORT_TASK_TIMEOUT_MS);
} }
out: out:
dev_warn(&ihost->pdev->dev,
"%s: Done; dev = %p, task = %p , old_request == %p\n",
__func__, idev, task, old_request);
isci_put_device(idev); isci_put_device(idev);
return ret; return ret;
} }