Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29396
b: refs/heads/master
c: cf2f768
h: refs/heads/master
v: v3
  • Loading branch information
Albert Lee authored and Jeff Garzik committed Mar 29, 2006
1 parent a235ead commit f205a6e
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 4bbf7bc4c7bf1c80ec3c942fa5f1b6e6fa67dd99
refs/heads/master: cf2f7689f94ee02e52d5331bc1a87421a67a882c
6 changes: 3 additions & 3 deletions trunk/drivers/scsi/libata-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -4397,7 +4397,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
fsm_start:
switch (ap->hsm_task_state) {
case HSM_ST_FIRST:
/* Some pre-ATAPI-4 devices assert INTRQ
/* Some pre-ATAPI-4 devices assert INTRQ
* at this state when ready to receive CDB.
*/

Expand All @@ -4422,7 +4422,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
ap->hsm_task_state = HSM_ST_LAST;
goto fsm_start;
}

atapi_pio_bytes(qc);

if (unlikely(ap->hsm_task_state == HSM_ST_ERR))
Expand Down Expand Up @@ -4476,7 +4476,7 @@ inline unsigned int ata_host_intr (struct ata_port *ap,
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
/* make sure qc->err_mask is available to
* know what's wrong and recover
*/
WARN_ON(qc->err_mask == 0);
Expand Down

0 comments on commit f205a6e

Please sign in to comment.