FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcte12xp: Set the t1.vpmadt032 pointer under the reglock.

Browse Source 
Ensures that a single run of the interrupt service routine is consistent
about whether there are VPMADT032 commands to process or not.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9949 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-06-02 20:02:18 +00:00
parent 456e7969ee
commit b60823b0cc
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/dahdi/wcte12xp/base.c
View File

@ -1390,6 +1390,7 @@ static int check_and_load_vpm(struct t1 *wc)
int res; int res;
unsigned long flags; unsigned long flags;
struct vpmadt032_options options; struct vpmadt032_options options;
struct vpmadt032 *vpm = NULL;
if (!vpmsupport) { if (!vpmsupport) {
t1_info(wc, "VPM Support Disabled\n"); t1_info(wc, "VPM Support Disabled\n");
@ -1417,15 +1418,20 @@ static int check_and_load_vpm(struct t1 *wc)
* done setting it up here, an hour should cover it... */ * done setting it up here, an hour should cover it... */
wc->vpm_check = jiffies + HZ*3600; wc->vpm_check = jiffies + HZ*3600;
wc->vpmadt032 = vpmadt032_alloc(&options, wc->name); vpm = vpmadt032_alloc(&options, wc->name);
if (!wc->vpmadt032) if (!vpm)
return -ENOMEM; return -ENOMEM;
wc->vpmadt032->setchanconfig_from_state = setchanconfig_from_state; vpm->setchanconfig_from_state = setchanconfig_from_state;
res = vpmadt032_init(wc->vpmadt032, &wc->vb); spin_lock_irqsave(&wc->reglock, flags);
wc->vpmadt032 = vpm;
spin_unlock_irqrestore(&wc->reglock, flags);
res = vpmadt032_init(vpm, &wc->vb);
if (-ENODEV == res) { if (-ENODEV == res) {
struct vpmadt032 *vpm = wc->vpmadt032; struct vpmadt032 *vpm = wc->vpmadt032;
/* There does not appear to be a VPMADT032 installed. */ /* There does not appear to be a VPMADT032 installed. */
clear_bit(VPM150M_ACTIVE, &wc->ctlreg); clear_bit(VPM150M_ACTIVE, &wc->ctlreg);
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
@ -1441,7 +1447,7 @@ static int check_and_load_vpm(struct t1 *wc)
return -EAGAIN; return -EAGAIN;
} }
if (config_vpmadt032(wc->vpmadt032, wc)) { if (config_vpmadt032(vpm, wc)) {
clear_bit(VPM150M_ACTIVE, &wc->ctlreg); clear_bit(VPM150M_ACTIVE, &wc->ctlreg);
wc->vpm_check = jiffies + HZ/2; wc->vpm_check = jiffies + HZ/2;
return -EAGAIN; return -EAGAIN;