From 4dda819ce3bdc90177a37d14f935e13575a04067 Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 11 Apr 2012 17:45:45 +0000 Subject: dahdi: Fix compilation when CONFIG_DAHDI_WATCHDOG is defined. From: Mike Sinkovsky Internal-Issue-ID: DAHLIN-288 Signed-off-by: Shaun Ruffell Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=10655 git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.6@10657 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/dahdi-base.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 08c5ad1..0863c0b 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -9976,7 +9976,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, spans_node) { if (s->flags & DAHDI_FLAG_RUNNING) { if (s->watchcounter == DAHDI_WATCHDOG_INIT) { @@ -9984,9 +9984,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; @@ -10001,7 +10001,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; -- cgit v1.2.3