diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-03-03 12:42:31 -0600 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-04-15 14:21:14 -0500 |
| commit | f900e1f229bbd4e04229052b18a1dc6cacbb0e52 (patch) | |
| tree | 88000a1a498af9c4b15324a7275f50a46bf2e667 /drivers/dahdi/wctdm.c | |
| parent | 3080253725eb7a1ba1cec08735c1476a3fd3c1c7 (diff) | |
dahdi: Move irq/irqmisses from dahdi_span into dahdi_device.
These fields do not have anything to do with the span.
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Diffstat (limited to 'drivers/dahdi/wctdm.c')
| -rw-r--r-- | drivers/dahdi/wctdm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c index 143af0a..bd3c5b1 100644 --- a/drivers/dahdi/wctdm.c +++ b/drivers/dahdi/wctdm.c @@ -2393,11 +2393,13 @@ static int wctdm_initialize(struct wctdm *wc) } wc->span.chans = wc->chans; wc->span.channels = NUM_CARDS; - wc->span.irq = wc->dev->irq; wc->span.flags = DAHDI_FLAG_RBS; wc->span.ops = &wctdm_span_ops; wc->ddev = dahdi_create_device(); + if (!wc->ddev) + return -ENOMEM; + wc->ddev->irq = wc->dev->irq; list_add_tail(&wc->span.device_node, &wc->ddev->spans); if (dahdi_register_device(wc->ddev, &wc->dev->dev)) { printk(KERN_NOTICE "Unable to register span with DAHDI\n"); |