diff options
Diffstat (limited to 'drivers/dahdi/wcte12xp')
| -rw-r--r-- | drivers/dahdi/wcte12xp/base.c | 11 | ||||
| -rw-r--r-- | drivers/dahdi/wcte12xp/wcte12xp.h | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/dahdi/wcte12xp/base.c b/drivers/dahdi/wcte12xp/base.c index 6ffb8ba..3139484 100644 --- a/drivers/dahdi/wcte12xp/base.c +++ b/drivers/dahdi/wcte12xp/base.c @@ -2145,6 +2145,16 @@ static void vpm_check_func(struct work_struct *work) #endif int res; u16 version; + const int MAX_CHECKS = 5; + + /* If there is a failed VPM module, do not block dahdi_cfg + * indefinitely. */ + if (++wc->vpm_check_count > MAX_CHECKS) { + set_bit(READY, &wc->bit_flags); + wc->vpm_check = MAX_JIFFY_OFFSET; + t1_info(wc, "Disabling VPMADT032 Checking.\n"); + return; + } if (!test_bit(INITIALIZED, &wc->bit_flags)) return; @@ -2154,6 +2164,7 @@ static void vpm_check_func(struct work_struct *work) if (!res) { set_bit(VPM150M_ACTIVE, &wc->ctlreg); wc->vpm_check = jiffies + HZ*5; + wc->vpm_check_count = 0; return; } diff --git a/drivers/dahdi/wcte12xp/wcte12xp.h b/drivers/dahdi/wcte12xp/wcte12xp.h index 3630478..66f3323 100644 --- a/drivers/dahdi/wcte12xp/wcte12xp.h +++ b/drivers/dahdi/wcte12xp/wcte12xp.h @@ -115,6 +115,7 @@ struct t1 { unsigned long bit_flags; unsigned long alarmtimer; unsigned char ledstate; + unsigned char vpm_check_count; struct dahdi_span span; /* Span */ struct dahdi_chan *chans[32]; /* Channels */ struct dahdi_echocan_state *ec[32]; /* Echocan state for channels */ |