diff options
Diffstat (limited to 'drivers/dahdi/pciradio.c')
| -rw-r--r-- | drivers/dahdi/pciradio.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c index e6ff52e..0384908 100644 --- a/drivers/dahdi/pciradio.c +++ b/drivers/dahdi/pciradio.c @@ -146,6 +146,7 @@ struct encdec struct pciradio { struct pci_dev *dev; + struct dahdi_device *ddev; struct dahdi_span span; unsigned char ios; int usecount; @@ -1488,7 +1489,7 @@ static int pciradio_initialize(struct pciradio *rad) rad->span.flags = DAHDI_FLAG_RBS; rad->span.ops = &pciradio_span_ops; - if (dahdi_register(&rad->span, 0)) { + if (dahdi_register_device(rad->ddev, &rad->dev->dev)) { printk(KERN_NOTICE "Unable to register span with DAHDI\n"); return -1; } @@ -1777,7 +1778,7 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de release_region(rad->ioaddr, 0xff); pci_free_consistent(pdev, DAHDI_MAX_CHUNKSIZE * 2 * 2 * 2 * 4, (void *)rad->writechunk, rad->writedma); pci_set_drvdata(pdev, NULL); - dahdi_unregister(&rad->span); + dahdi_free_device(rad->ddev); kfree(rad); return -EIO; @@ -1810,7 +1811,7 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de static void pciradio_release(struct pciradio *rad) { - dahdi_unregister(&rad->span); + dahdi_unregister_device(rad->ddev); if (rad->freeregion) release_region(rad->ioaddr, 0xff); kfree(rad); |