Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29450
b: refs/heads/master
c: a20f33f
h: refs/heads/master
v: v3
  • Loading branch information
Tejun Heo authored and Jeff Garzik committed May 20, 2006
1 parent ec769e8 commit 3396d3a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 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: eec4c3f317991dc85c786ffccd9c1a8620c41b18
refs/heads/master: a20f33ffde8ba5fb27666aa1e228a45b7e3b8dcb
10 changes: 6 additions & 4 deletions trunk/drivers/scsi/libata-eh.c
Original file line number Diff line number Diff line change
Expand Up @@ -1169,9 +1169,6 @@ static void ata_eh_autopsy(struct ata_port *ap)
/* inherit upper level err_mask */
qc->err_mask |= ehc->i.err_mask;

if (qc->err_mask & AC_ERR_TIMEOUT)
action |= ATA_EH_SOFTRESET;

/* analyze TF */
action |= ata_eh_analyze_tf(qc, &qc->result_tf);

Expand Down Expand Up @@ -1201,9 +1198,14 @@ static void ata_eh_autopsy(struct ata_port *ap)
if (failed_dev)
action |= ata_eh_speed_down(failed_dev, is_io, all_err_mask);

if (all_err_mask)
/* enforce default EH actions */
if (ap->flags & ATA_FLAG_FROZEN ||
all_err_mask & (AC_ERR_HSM | AC_ERR_TIMEOUT))
action |= ATA_EH_SOFTRESET;
else if (all_err_mask)
action |= ATA_EH_REVALIDATE;

/* record autopsy result */
ehc->i.dev = failed_dev;
ehc->i.action = action;

Expand Down

0 comments on commit 3396d3a

Please sign in to comment.