leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

Browse Source 
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [PATCH] ahci: fix NULL pointer dereference detected by Coverity
This commit is contained in:
Linus Torvalds 2006-03-12 16:41:27 -08:00
commit 57ddd5c180
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/scsi/ahci.c
View File

@ -742,23 +742,17 @@ 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);