Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 254541
b: refs/heads/master
c: ff717ab
h: refs/heads/master
i:
  254539: 1180472
v: v3
  • Loading branch information
Jeff Skirvin authored and Dan Williams committed Jul 3, 2011
1 parent b5817de commit 059ef1c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7c78da3175177c905a75c54b5830029c778494ea
refs/heads/master: ff717ab05f0c33f93514eccea6dfe1a15983e1d1
4 changes: 3 additions & 1 deletion trunk/drivers/scsi/isci/task.c
Original file line number Diff line number Diff line change
Expand Up @@ -1433,15 +1433,17 @@ static int isci_reset_device(struct domain_device *dev, int hard_reset)
isci_device_clear_reset_pending(ihost, idev);

rc = sas_phy_reset(phy, hard_reset);
msleep(2000); /* just like mvsas */

/* Terminate in-progress I/O now. */
isci_remote_device_nuke_requests(ihost, idev);

/* Since all pending TCs have been cleaned, resume the RNC. */
spin_lock_irqsave(&ihost->scic_lock, flags);
status = scic_remote_device_reset_complete(&idev->sci);
spin_unlock_irqrestore(&ihost->scic_lock, flags);

msleep(2000); /* just like mvsas */

if (status != SCI_SUCCESS) {
dev_warn(&ihost->pdev->dev,
"%s: scic_remote_device_reset_complete(%p) "
Expand Down

0 comments on commit 059ef1c

Please sign in to comment.