From f236ae4ac7f67d1130a4b51530d511a0d5ef30ff Mon Sep 17 00:00:00 2001 From: Mark Allyn Date: Wed, 25 Jan 2012 10:53:30 -0800 Subject: [PATCH] [PORT FROM R2] driver: intel_scu_watchdog: remove all gating from interrupt handler BZ: 21273 There was some lagacy gating code in the driver from the days when the driver would do the initial setting of the clock. Change-Id: Id5520a832cc7d0e90fe39876ede62bcbe5d6486c Reviewed-on: http://android.intel.com:8080/33944 Reviewed-by: Chotard, Celine Tested-by: Chotard, Celine Reviewed-by: Lebouc, Christophe Reviewed-by: buildbot Tested-by: buildbot --- drivers/watchdog/intel_scu_watchdog.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/intel_scu_watchdog.c b/drivers/watchdog/intel_scu_watchdog.c index 804ed92..bc1d820 100644 --- a/drivers/watchdog/intel_scu_watchdog.c +++ b/drivers/watchdog/intel_scu_watchdog.c @@ -331,10 +331,12 @@ int ret; /* timer interrupt handler */ static irqreturn_t watchdog_timer_interrupt(int irq, void *dev_id) { - /* has the timer been started? If not, then this is spurious */ - if (!watchdog_device.started) { - pr_warn(PFX "Spurious interrupt received\n"); - return IRQ_HANDLED; + if (watchdog_device.started) { + pr_warn(PFX "Expected SW WDT warning irq received\n"); + } else { + /* Unexpected, but we'd better to handle it anyway */ + /* and so try to avoid a ColdReset */ + pr_warn(PFX "Unexpected SW WDT warning irq received\n"); } tasklet_schedule(&watchdog_device.interrupt_tasklet); -- 2.7.4