From patchwork Thu Feb 14 08:14:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 2140651 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 3C934DF283 for ; Thu, 14 Feb 2013 08:17:33 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5tyE-0004Og-49; Thu, 14 Feb 2013 08:15:06 +0000 Received: from mail-ee0-f43.google.com ([74.125.83.43]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5txo-0004IY-J6 for linux-arm-kernel@lists.infradead.org; Thu, 14 Feb 2013 08:14:41 +0000 Received: by mail-ee0-f43.google.com with SMTP id c50so1076548eek.2 for ; Thu, 14 Feb 2013 00:14:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=GDSNlAauWXRqLYM5McMbQIe1dlbHzyIudhTYwLjB2o8=; b=MDC+RafILeMap1GfUzoIzdNOUsIAuQML51FQqrv3hYgjhX83Pcs23rymoETKERvbfc oy7n/5vaig/Pav6Eenp5ZNWnpbFriHrer2E0EyjLH6I3WGKTyQLM/9dVyZZi0W3QdQvI kiWmy6PhIvhA86UgnTh1EcpNJi+9S+nC7tlc3aVBQ7ycrUIE2yL8ppNVjKA9+AFwgkbF xqB+THMX4GP70Lh0TrOrUHTenLrbsCNW90XF7kApPEbzGgzJon7HCu92OPCiZiJgXgU4 Q6DaWgkE3VPMIbsGNLa/CflzRIC5DWDE4Z+gCBVBEaMkEfHsSBgLSH5HQn4ffHX1TbFm 1QCA== X-Received: by 10.14.3.133 with SMTP id 5mr51995723eeh.43.1360829679378; Thu, 14 Feb 2013 00:14:39 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id f47sm31513859eep.13.2013.02.14.00.14.37 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 14 Feb 2013 00:14:38 -0800 (PST) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , Jason Cooper , Andrew Lunn , Ben Dooks , Kukjin Kim Subject: [PATCH v9 2/8] watchdog: core: fix watchdog_check_min_max_timeout() return value Date: Thu, 14 Feb 2013 09:14:24 +0100 Message-Id: <1360829670-10418-3-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1360829670-10418-1-git-send-email-fabio.porcedda@gmail.com> References: <1360829670-10418-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130214_031440_791527_9160FBA8 X-CRM114-Status: GOOD ( 13.53 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.43 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: devicetree-discuss@lists.ozlabs.org, Wenyou Yang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org The device tree support is not mandatory, so the function doesn't return error when is not used. Return -EINVAL when the module parameter or timeout-sec property is out of bounds. Signed-off-by: Fabio Porcedda Cc: Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org --- drivers/watchdog/watchdog_core.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/watchdog_core.c b/drivers/watchdog/watchdog_core.c index 94590f6..05d18b4 100644 --- a/drivers/watchdog/watchdog_core.c +++ b/drivers/watchdog/watchdog_core.c @@ -73,22 +73,28 @@ int watchdog_init_timeout(struct watchdog_device *wdd, unsigned int timeout_parm, struct device *dev) { unsigned int t = 0; + int ret = 0; watchdog_check_min_max_timeout(wdd); /* try to get the tiemout module parameter first */ if (!watchdog_timeout_invalid(wdd, timeout_parm)) { wdd->timeout = timeout_parm; - return 0; + return ret; } + if (timeout_parm) + ret = -EINVAL; /* try to get the timeout_sec property */ if (dev == NULL || dev->of_node == NULL) - return -EINVAL; + return ret; of_property_read_u32(dev->of_node, "timeout-sec", &t); if (!watchdog_timeout_invalid(wdd, t)) wdd->timeout = t; - return 0; + else + ret = -EINVAL; + + return ret; } EXPORT_SYMBOL_GPL(watchdog_init_timeout);