diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2012-04-11 17:45:35 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2012-04-11 17:45:35 +0000 |
| commit | 9dcacd42beef2933ef6ea34782fb89ecae21035f (patch) | |
| tree | a8ccab8bdbc0d7a3e9c4a0286c0e1239e870483c | |
| parent | 6074582cf3b1a20f39124d7213d7ff331b781386 (diff) | |
dahdi: Fix compilation when CONFIG_DAHDI_WATCHDOG is defined.
From: Mike Sinkovsky <msink@trikom.ru>
Internal-Issue-ID: DAHLIN-288
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10655
Conflicts:
drivers/dahdi/dahdi-base.c
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.5@10656 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 2e83b2c..a442438 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -9412,7 +9412,7 @@ static void watchdog_check(unsigned long ignored) static int wdcheck=0; struct dahdi_span *s; - spin_lock_irqsave(&span_list_lock, flags); + spin_lock_irqsave(&chan_lock, flags); list_for_each_entry(s, &span_list, node) { if (s->flags & DAHDI_FLAG_RUNNING) { if (s->watchcounter == DAHDI_WATCHDOG_INIT) { @@ -9420,9 +9420,9 @@ static void watchdog_check(unsigned long ignored) if ((s->watchstate == DAHDI_WATCHSTATE_OK) || (s->watchstate == DAHDI_WATCHSTATE_UNKNOWN)) { s->watchstate = DAHDI_WATCHSTATE_RECOVERING; - if (s->watchdog) { + if (s->ops->watchdog) { module_printk(KERN_NOTICE, "Kicking span %s\n", s->name); - s->watchdog(spans[x], DAHDI_WATCHDOG_NOINTS); + s->ops->watchdog(s, DAHDI_WATCHDOG_NOINTS); } else { module_printk(KERN_NOTICE, "Span %s is dead with no revival\n", s->name); s->watchstate = DAHDI_WATCHSTATE_FAILED; @@ -9437,7 +9437,7 @@ static void watchdog_check(unsigned long ignored) s->watchcounter = DAHDI_WATCHDOG_INIT; } } - spin_unlock_irqrestore(&span_list_lock, flags); + spin_unlock_irqrestore(&chan_lock, flags); if (!wdcheck) { module_printk(KERN_NOTICE, "watchdog on duty!\n"); wdcheck=1; |