summaryrefslogtreecommitdiff
path: root/drivers/dahdi/voicebus
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-11-07 00:35:45 +0000
committerShaun Ruffell <sruffell@digium.com>2009-11-07 00:35:45 +0000
commitb01e09ca0ddfb3fbd6710295e7aead42e1432605 (patch)
tree3ca90a00f9f30e846bd4940fd953ea06c84dd19e /drivers/dahdi/voicebus
parent4f0c363434392393589113ebc05c7a9770e6eaf2 (diff)
voicebus: Be just a little more graceful if we cannot grab our interrupt line.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@7524 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/voicebus')
-rw-r--r--drivers/dahdi/voicebus/voicebus.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dahdi/voicebus/voicebus.c b/drivers/dahdi/voicebus/voicebus.c
index 7051c59..70a1128 100644
--- a/drivers/dahdi/voicebus/voicebus.c
+++ b/drivers/dahdi/voicebus/voicebus.c
@@ -1822,9 +1822,10 @@ voicebus_init(struct pci_dev *pdev, u32 framesize, const char *board_name,
vb_enable_io_access(vb);
#if VOICEBUS_DEFERRED != TIMER
- if (request_irq(pdev->irq, vb_isr, DAHDI_IRQ_SHARED, board_name,
- vb)) {
- BUG_ON(1);
+ retval = request_irq(pdev->irq, vb_isr, DAHDI_IRQ_SHARED,
+ board_name, vb);
+ if (retval) {
+ dev_warn(&vb->pdev->dev, "Failed to request interrupt line.\n");
goto cleanup;
}
#endif