diff options
| author | Jeff Garzik | 2006-03-24 15:27:49 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2006-03-24 15:27:49 +0100 |
| commit | 84ac69e8bf9f36eb0166817373336d14fa58f5cc (patch) | |
| tree | 46325313df2311680c8e11a828c243f5dccb3407 /drivers/scsi | |
| parent | Merge branch 'upstream' (diff) | |
| download | kernel-qcow2-linux-84ac69e8bf9f36eb0166817373336d14fa58f5cc.tar.gz kernel-qcow2-linux-84ac69e8bf9f36eb0166817373336d14fa58f5cc.tar.xz kernel-qcow2-linux-84ac69e8bf9f36eb0166817373336d14fa58f5cc.zip | |
[libata] irq-pio: fix build breakage
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/sata_vsc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/sata_vsc.c b/drivers/scsi/sata_vsc.c index 8c818d47c1fd..9f621a97c977 100644 --- a/drivers/scsi/sata_vsc.c +++ b/drivers/scsi/sata_vsc.c @@ -229,14 +229,13 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance, handled++; } - if (ap && !(ap->flags & - (ATA_FLAG_PORT_DISABLED|ATA_FLAG_NOINTR))) { + if (ap && !(ap->flags & ATA_FLAG_PORT_DISABLED)) { struct ata_queued_cmd *qc; qc = ata_qc_from_tag(ap, ap->active_tag); if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) handled += ata_host_intr(ap, qc); - } else if (is_vsc_sata_int_err(i, int_status)) { + else if (is_vsc_sata_int_err(i, int_status)) { /* * On some chips (i.e. Intel 31244), an error * interrupt will sneak in at initialization |