From 402b2e86198a7600115da4ce6e9e8f46cb9cb9a9 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 16 Nov 2011 11:52:12 +0000
Subject: [PATCH] --- yaml --- r: 275867 b: refs/heads/master c:
 f9849100851b28c8ad83e86d68d5110497a4e9d6 h: refs/heads/master i:   275865:
 d5cbfc40867ec4b4c8c359787a27eaf15656471b   275863:
 41b9ea2d2a41d41e62e3f1a4d4605150994512ec v: v3

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

diff --git a/[refs] b/[refs]
index fd8805ae1ae8..f81728784b29 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 943ef2ec4f5f14940ea391d25bf93eb99eb2ff2a
+refs/heads/master: f9849100851b28c8ad83e86d68d5110497a4e9d6
diff --git a/trunk/drivers/watchdog/wm831x_wdt.c b/trunk/drivers/watchdog/wm831x_wdt.c
index 7be38556aed0..e789a47db41f 100644
--- a/trunk/drivers/watchdog/wm831x_wdt.c
+++ b/trunk/drivers/watchdog/wm831x_wdt.c
@@ -150,7 +150,7 @@ static int wm831x_wdt_set_timeout(struct watchdog_device *wdt_dev,
 		if (wm831x_wdt_cfgs[i].time == timeout)
 			break;
 	if (i == ARRAY_SIZE(wm831x_wdt_cfgs))
-		ret = -EINVAL;
+		return -EINVAL;
 
 	ret = wm831x_reg_unlock(wm831x);
 	if (ret == 0) {