Skip to content

L
linux-davinci-2.6.23
Commit 75deb6fa authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'upstream-fixes'

parents 2061a47a 6971ed1f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 10 deletions
drivers/scsi/ahci.c
View file @ 75deb6fa
...@@ -778,24 +778,18 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * ...@@ -778,24 +778,18 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs *
struct ata_queued_cmd *qc; struct ata_queued_cmd *qc;
qc = ata_qc_from_tag(ap, ap->active_tag); qc = ata_qc_from_tag(ap, ap->active_tag);
if (!ahci_host_intr(ap, qc)) if (!ahci_host_intr(ap, qc))
if (ata_ratelimit()) { if (ata_ratelimit())
struct pci_dev *pdev = dev_printk(KERN_WARNING, host_set->dev,
to_pci_dev(ap->host_set->dev);
dev_printk(KERN_WARNING, &pdev->dev,
"unhandled interrupt on port %u\n", "unhandled interrupt on port %u\n",
i); i);
}
VPRINTK("port %u\n", i); VPRINTK("port %u\n", i);
} else { } else {
VPRINTK("port %u (no irq)\n", i); VPRINTK("port %u (no irq)\n", i);
if (ata_ratelimit()) { if (ata_ratelimit())
struct pci_dev *pdev = dev_printk(KERN_WARNING, host_set->dev,
to_pci_dev(ap->host_set->dev);
dev_printk(KERN_WARNING, &pdev->dev,
"interrupt on disabled port %u\n", i); "interrupt on disabled port %u\n", i);
} }
}
irq_ack |= (1 << i); irq_ack |= (1 << i);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment