From 3c43425def95af48a19f94474930f45e0b70e865 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 14 Oct 2009 01:18:26 -0700
Subject: [PATCH] --- yaml --- r: 167487 b: refs/heads/master c:
 03717e3d12b625268848414e39beda25e4515692 h: refs/heads/master i:   167485:
 f8eceaa94c81c39c79b65113567e8e59b5ea25d1   167483:
 d6dde8ff46c1ed8771a23a48ddb12dac06751277   167479:
 055b1d88a72e697c136b2de3694a1612e85063fd   167471:
 169c0b0f931d3e4c0d45ef3efb14e46203003880   167455:
 2964524fcf7b7709ef9b2d6c117bb4b96049b541   167423:
 2973b9ed4d7feb13452e7eab3b516d94bfcdc9b1 v: v3

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

diff --git a/[refs] b/[refs]
index 45a8164ed886..cb02650607f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c58543c869606532c2382f027d6466f4672ea756
+refs/heads/master: 03717e3d12b625268848414e39beda25e4515692
diff --git a/trunk/drivers/watchdog/riowd.c b/trunk/drivers/watchdog/riowd.c
index 1e8f02f440e6..d3c824dc2358 100644
--- a/trunk/drivers/watchdog/riowd.c
+++ b/trunk/drivers/watchdog/riowd.c
@@ -206,7 +206,7 @@ static int __devinit riowd_probe(struct of_device *op,
 
 	dev_set_drvdata(&op->dev, p);
 	riowd_device = p;
-	err = 0;
+	return 0;
 
 out_iounmap:
 	of_iounmap(&op->resource[0], p->regs, 2);