diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 17:21:44 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 17:21:44 +0000 |
| commit | fd1eb57bf71bcabee863bcd96686f9e6d2d39cca (patch) | |
| tree | 58b0cc9bf8336eb774781d04bf6f3a42070445f9 /drivers/dahdi/pciradio.c | |
| parent | 10a66f7e3a9d5fed45a8a47144dfaca342ddf105 (diff) | |
fix up the last few drivers for the new single-allocation channel changes
(related to issue #12657)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4521 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/pciradio.c')
| -rw-r--r-- | drivers/dahdi/pciradio.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dahdi/pciradio.c b/drivers/dahdi/pciradio.c index 30d49d1..5467147 100644 --- a/drivers/dahdi/pciradio.c +++ b/drivers/dahdi/pciradio.c @@ -200,7 +200,8 @@ struct pciradio { #define RADMODE_IGNORECT 16 #define RADMODE_NOENCODE 32 unsigned char corthresh[NUM_CHANS]; - struct dahdi_chan chans[NUM_CHANS]; + struct dahdi_chan _chans[NUM_CHANS]; + struct dahdi_chan *chans; unsigned char mx828_addr; struct encdec encdec; unsigned long lastremcmd; @@ -1479,7 +1480,7 @@ static int pciradio_initialize(struct pciradio *rad) rad->ctcssacquiretime[x] = RAD_CTCSS_ACQUIRE_TIME; rad->ctcsstalkofftime[x] = RAD_CTCSS_TALKOFF_TIME; } - rad->span.chans = rad->chans; + rad->span.chans = &rad->chans; rad->span.channels = rad->nchans; rad->span.hooksig = pciradio_hooksig; rad->span.open = pciradio_open; @@ -1718,6 +1719,7 @@ static int __devinit pciradio_init_one(struct pci_dev *pdev, const struct pci_de int i; ifaces[x] = rad; + rad->chans = rad->_chans; memset(rad, 0, sizeof(struct pciradio)); spin_lock_init(&rad->lock); rad->nchans = 4; |