From 3ea108d4e499985fca34bc6a603d0582802ae366 Mon Sep 17 00:00:00 2001
From: Ilpo Jarvinen <ilpo.jarvinen@helsinki.fi>
Date: Tue, 23 Oct 2007 13:40:54 -0700
Subject: [PATCH] --- yaml --- r: 72997 b: refs/heads/master c:
 59338d4cb68528062f294d95f116357265936076 h: refs/heads/master i:   72995:
 e6aa7f564b808cf3d7f0bf8b310d0fff0a9b977b v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/watchdog/wdt.c     | 3 ++-
 trunk/drivers/watchdog/wdt_pci.c | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 0e2cc9de81fc..b2c931ec377f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb0a38d8915b568a012888082dce731092b9803e
+refs/heads/master: 59338d4cb68528062f294d95f116357265936076
diff --git a/trunk/drivers/watchdog/wdt.c b/trunk/drivers/watchdog/wdt.c
index 0a3de6a02442..53d0bb410df8 100644
--- a/trunk/drivers/watchdog/wdt.c
+++ b/trunk/drivers/watchdog/wdt.c
@@ -253,7 +253,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
 			printk(KERN_CRIT "Possible fan fault.\n");
 	}
 #endif /* CONFIG_WDT_501 */
-	if (!(status & WDC_SR_WCCR))
+	if (!(status & WDC_SR_WCCR)) {
 #ifdef SOFTWARE_REBOOT
 #ifdef ONLY_TESTING
 		printk(KERN_CRIT "Would Reboot.\n");
@@ -264,6 +264,7 @@ static irqreturn_t wdt_interrupt(int irq, void *dev_id)
 #else
 		printk(KERN_CRIT "Reset in 5ms.\n");
 #endif
+	}
 	return IRQ_HANDLED;
 }
 
diff --git a/trunk/drivers/watchdog/wdt_pci.c b/trunk/drivers/watchdog/wdt_pci.c
index 6baf4ae42c9d..6bfe0e29dc1a 100644
--- a/trunk/drivers/watchdog/wdt_pci.c
+++ b/trunk/drivers/watchdog/wdt_pci.c
@@ -298,7 +298,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
 			printk(KERN_CRIT PFX "Possible fan fault.\n");
 	}
 #endif /* CONFIG_WDT_501_PCI */
-	if (!(status&WDC_SR_WCCR))
+	if (!(status&WDC_SR_WCCR)) {
 #ifdef SOFTWARE_REBOOT
 #ifdef ONLY_TESTING
 		printk(KERN_CRIT PFX "Would Reboot.\n");
@@ -309,6 +309,7 @@ static irqreturn_t wdtpci_interrupt(int irq, void *dev_id)
 #else
 		printk(KERN_CRIT PFX "Reset in 5ms.\n");
 #endif
+	}
 	return IRQ_HANDLED;
 }