diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:41 -0500 |
| commit | fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0 (patch) | |
| tree | cba2597077cf33d122f8d771bf84618cc5374cf6 /drivers/scsi/sata_qstor.c | |
| parent | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi/sata_qstor.c')
| -rw-r--r-- | drivers/scsi/sata_qstor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sata_qstor.c b/drivers/scsi/sata_qstor.c index 6e0c749b6cb4..6317a9a96e69 100644 --- a/drivers/scsi/sata_qstor.c +++ b/drivers/scsi/sata_qstor.c | |||
| @@ -432,7 +432,7 @@ static inline unsigned int qs_intr_mmio(struct ata_host_set *host_set) | |||
| 432 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { | 432 | if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) { |
| 433 | 433 | ||
| 434 | /* check main status, clearing INTRQ */ | 434 | /* check main status, clearing INTRQ */ |
| 435 | u8 status = ata_chk_status(ap); | 435 | u8 status = ata_check_status(ap); |
| 436 | if ((status & ATA_BUSY)) | 436 | if ((status & ATA_BUSY)) |
| 437 | continue; | 437 | continue; |
| 438 | DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n", | 438 | DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n", |