From 90ae4f1bf06e18244b98cb8be7d8eaf0ba94b747 Mon Sep 17 00:00:00 2001
From: Naveen Gupta <ngupta@google.com>
Date: Sun, 21 Aug 2005 13:02:41 +0200
Subject: [PATCH] --- yaml --- r: 8805 b: refs/heads/master c:
 811f999160487c586917937e95506cb8528472a3 h: refs/heads/master i:   8803:
 2ed6c97fc34c1e5fe8b7d1f1da99983f1bac849f v: v3

---
 [refs]                                 |  2 +-
 trunk/drivers/char/watchdog/i6300esb.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 78d7d7fd48d0..0ee65ede1988 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce2f50b4ae71f700c7b4b0bf0ff11c328611dae8
+refs/heads/master: 811f999160487c586917937e95506cb8528472a3
diff --git a/trunk/drivers/char/watchdog/i6300esb.c b/trunk/drivers/char/watchdog/i6300esb.c
index c04b246858ae..823924e4249b 100644
--- a/trunk/drivers/char/watchdog/i6300esb.c
+++ b/trunk/drivers/char/watchdog/i6300esb.c
@@ -69,11 +69,7 @@ static int heartbeat = WATCHDOG_HEARTBEAT;  /* in seconds */
 module_param(heartbeat, int, 0);
 MODULE_PARM_DESC(heartbeat, "Watchdog heartbeat in seconds. (1<heartbeat<2046, default=" __MODULE_STRING(WATCHDOG_HEARTBEAT) ")");
 
-#ifdef CONFIG_WATCHDOG_NOWAYOUT
-static int nowayout = 1;
-#else
-static int nowayout = 0;
-#endif
+static int nowayout = WATCHDOG_NOWAYOUT;
 module_param(nowayout, int, 0);
 MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=CONFIG_WATCHDOG_NOWAYOUT)");
 
@@ -368,16 +364,17 @@ static unsigned char __init esb_getdevice (void)
          *      Find the PCI device
          */
 
-        for_each_pci_dev(dev)
+        for_each_pci_dev(dev) {
                 if (pci_match_device(esb_pci_tbl, dev)) {
                         esb_pci = dev;
                         break;
                 }
+	}
 
         if (esb_pci) {
         	if (pci_enable_device(esb_pci)) {
 			printk (KERN_ERR PFX "failed to enable device\n");
-			goto out;
+			goto err_devput;
 		}
 
 		if (pci_request_region(esb_pci, 0, ESB_MODULE_NAME)) {
@@ -429,9 +426,9 @@ static unsigned char __init esb_getdevice (void)
 		pci_release_region(esb_pci, 0);
 err_disable:
 		pci_disable_device(esb_pci);
+err_devput:
 		pci_dev_put(esb_pci);
 	}
-out:
 	return 0;
 }
 
@@ -481,8 +478,8 @@ static int __init watchdog_init (void)
 	pci_release_region(esb_pci, 0);
 /* err_disable: */
 	pci_disable_device(esb_pci);
+/* err_devput: */
 	pci_dev_put(esb_pci);
-/* out: */
         return ret;
 }