diff options
| author | mav <mav@FreeBSD.org> | 2010-07-16 10:05:00 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2010-07-16 10:05:00 +0000 |
| commit | 7b58892c3320dd5bd9ee4a63bd3d069f9ab0d1af (patch) | |
| tree | e151b171edc63a17681876c607ff67cd836117bb /sys/dev/ata/ata-pci.c | |
| parent | 4b1b0132725cfd6fe5550c506752c4786797f311 (diff) | |
| download | FreeBSD-src-7b58892c3320dd5bd9ee4a63bd3d069f9ab0d1af.zip FreeBSD-src-7b58892c3320dd5bd9ee4a63bd3d069f9ab0d1af.tar.gz | |
Improve interrupt setup errors handling.
Diffstat (limited to 'sys/dev/ata/ata-pci.c')
| -rw-r--r-- | sys/dev/ata/ata-pci.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/dev/ata/ata-pci.c b/sys/dev/ata/ata-pci.c index fea7c96..f3c2a27 100644 --- a/sys/dev/ata/ata-pci.c +++ b/sys/dev/ata/ata-pci.c @@ -806,17 +806,23 @@ ata_setup_interrupt(device_t dev, void *intr_func) if (msi && pci_msi_count(dev) > 0 && pci_alloc_msi(dev, &msi) == 0) { ctlr->r_irq_rid = 0x1; } else { + msi = 0; ctlr->r_irq_rid = ATA_IRQ_RID; } if (!(ctlr->r_irq = bus_alloc_resource_any(dev, SYS_RES_IRQ, &ctlr->r_irq_rid, RF_SHAREABLE | RF_ACTIVE))) { device_printf(dev, "unable to map interrupt\n"); + if (msi) + pci_release_msi(dev); return ENXIO; } if ((bus_setup_intr(dev, ctlr->r_irq, ATA_INTR_FLAGS, NULL, intr_func, ctlr, &ctlr->handle))) { - /* SOS XXX release r_irq */ device_printf(dev, "unable to setup interrupt\n"); + bus_release_resource(dev, + SYS_RES_IRQ, ctlr->r_irq_rid, ctlr->r_irq); + if (msi) + pci_release_msi(dev); return ENXIO; } } |
