From: Guenter Roeck <linux@roeck-us.net>
Date: Mon, 14 Oct 2013 16:32:48 +0000 (-0700)
Subject: watchdog: ts72xx_wdt: Propagate return value from timeout_to_regval
X-Git-Tag: v3.13-rc1~42^2~11
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=67b9fbdf3602dfd525371d7b1f49346f1d11d37d;p=cascardo%2Flinux.git

watchdog: ts72xx_wdt: Propagate return value from timeout_to_regval

timeout_to_regval() returns a valid error code. Might as well use it.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c
index df5dd55b9b3a..09d4831aa61f 100644
--- a/drivers/watchdog/ts72xx_wdt.c
+++ b/drivers/watchdog/ts72xx_wdt.c
@@ -192,7 +192,7 @@ static int ts72xx_wdt_open(struct inode *inode, struct file *file)
 		dev_err(&wdt->pdev->dev,
 			"failed to convert timeout (%d) to register value\n",
 			timeout);
-		return -EINVAL;
+		return regval;
 	}
 
 	if (mutex_lock_interruptible(&wdt->lock))