Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29363
b: refs/heads/master
c: 000080c
h: refs/heads/master
i:
  29361: dfe170d
  29359: 6344fee
v: v3
  • Loading branch information
Albert Lee authored and Jeff Garzik committed Jan 18, 2006
1 parent 9645cd3 commit 9b6882b
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: a4f16610081001640ffe0314024bc31c10f69757
refs/heads/master: 000080c3499cd5037e60c08a8053efb9e48aa9c0
10 changes: 6 additions & 4 deletions trunk/drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -3520,11 +3520,12 @@ static void ata_pio_error(struct ata_port *ap)
{
struct ata_queued_cmd *qc;

printk(KERN_WARNING "ata%u: PIO error\n", ap->id);

qc = ata_qc_from_tag(ap, ap->active_tag);
assert(qc != NULL);

if (qc->tf.command != ATA_CMD_PACKET)
printk(KERN_WARNING "ata%u: PIO error\n", ap->id);

/* make sure qc->err_mask is available to
* know what's wrong and recover
*/
Expand Down Expand Up @@ -4404,8 +4405,9 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
break;

case HSM_ST_ERR:
printk(KERN_ERR "ata%u: command error, drv_stat 0x%x host_stat 0x%x\n",
ap->id, status, host_stat);
if (qc->tf.command != ATA_CMD_PACKET)
printk(KERN_ERR "ata%u: command error, drv_stat 0x%x host_stat 0x%x\n",
ap->id, status, host_stat);

/* make sure qc->err_mask is available to
* know what's wrong and recover
Expand Down

0 comments on commit 9b6882b

Please sign in to comment.