diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /drivers/scsi/ahci.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/ahci.c')
| -rw-r--r-- | drivers/scsi/ahci.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c index 77e7202a0eba..904c25fb4ba4 100644 --- a/drivers/scsi/ahci.c +++ b/drivers/scsi/ahci.c | |||
| @@ -940,14 +940,8 @@ static void ahci_host_intr(struct ata_port *ap) | |||
| 940 | return; | 940 | return; |
| 941 | 941 | ||
| 942 | /* ignore interim PIO setup fis interrupts */ | 942 | /* ignore interim PIO setup fis interrupts */ |
| 943 | if (ata_tag_valid(ap->active_tag)) { | 943 | if (ata_tag_valid(ap->active_tag) && (status & PORT_IRQ_PIOS_FIS)) |
| 944 | struct ata_queued_cmd *qc = | 944 | return; |
| 945 | ata_qc_from_tag(ap, ap->active_tag); | ||
| 946 | |||
| 947 | if (qc && qc->tf.protocol == ATA_PROT_PIO && | ||
| 948 | (status & PORT_IRQ_PIOS_FIS)) | ||
| 949 | return; | ||
| 950 | } | ||
| 951 | 945 | ||
| 952 | if (ata_ratelimit()) | 946 | if (ata_ratelimit()) |
| 953 | ata_port_printk(ap, KERN_INFO, "spurious interrupt " | 947 | ata_port_printk(ap, KERN_INFO, "spurious interrupt " |