diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 14:05:57 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2008-07-02 14:05:57 +0000 |
| commit | bfb41541536eebb7bcf0903395129adfd17fd3d0 (patch) | |
| tree | cc3b9b5a61f229bc887f4e0db9dfc0eed45a140c /drivers/dahdi/wctdm.c | |
| parent | e00232e3932675cfb55a41aaed49411b5d66e84d (diff) | |
fix remaining drivers broken by pointer type change in 'struct dahdi_span'... wctdm24xxp still broken, will fix in a couple of hours
(related to issue #12657)
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4514 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers/dahdi/wctdm.c')
| -rw-r--r-- | drivers/dahdi/wctdm.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c index a50aeff..eb6e28e 100644 --- a/drivers/dahdi/wctdm.c +++ b/drivers/dahdi/wctdm.c @@ -252,7 +252,8 @@ struct wctdm { dma_addr_t writedma; volatile unsigned int *writechunk; /* Double-word aligned write memory */ volatile unsigned int *readchunk; /* Double-word aligned read memory */ - struct dahdi_chan chans[NUM_CARDS]; + struct dahdi_chan _chans[NUM_CARDS]; + struct dahdi_chan *chans; }; @@ -2030,7 +2031,7 @@ static int wctdm_initialize(struct wctdm *wc) wc->chans[x].chanpos = x+1; wc->chans[x].pvt = wc; } - wc->span.chans = wc->chans; + wc->span.chans = &wc->chans; wc->span.channels = NUM_CARDS; wc->span.hooksig = wctdm_hooksig; wc->span.irq = wc->dev->irq; @@ -2261,6 +2262,7 @@ static int __devinit wctdm_init_one(struct pci_dev *pdev, const struct pci_devic int cardcount = 0; ifaces[x] = wc; + wc->chans = wc->_chans; memset(wc, 0, sizeof(struct wctdm)); spin_lock_init(&wc->lock); wc->curcard = -1; |