From patchwork Fri Oct 5 21:33:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Senna Tschudin X-Patchwork-Id: 189605 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id DB05F2C0313 for ; Sat, 6 Oct 2012 07:34:48 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757513Ab2JEVeR (ORCPT ); Fri, 5 Oct 2012 17:34:17 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:39285 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753730Ab2JEVdc (ORCPT ); Fri, 5 Oct 2012 17:33:32 -0400 Received: by mail-wg0-f42.google.com with SMTP id fm10so606917wgb.1 for ; Fri, 05 Oct 2012 14:33:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=CfRlkwCjtZmTrHR4j4Dgqh8FxATRYyV3x6gYq9O32gw=; b=g851wE+zxP4cfqCQHbL5kEtlKZtHYHWN6YojKnUusaKKjsEZrz0lzCmUB3LenN1P6i 0lK1FjJY1S4ngO7EKyrN8eCgeCWKwA4Z9Ji2EXwW7VPgbzErdqPBJZY+0VgBDrgXM8z4 fyJsIBPNk8B91RCo5M34mcswVpmGuiHXH11ig8gUwe660l+KiSo7Pq87/dTOoUIcpqK6 SiBGG6+0y0pyssTOuh6t+itlOv47FqXWWZwdHEW/DrkR0TFAKCwPz6bD5jnbliru/JuN nHHjBsKxCrH/0LgZaEbkNg7nRlBJCL8Sz9/JMg2sRF4A8drJ9iEUvOCnlfxR76bhPcTQ n1Dw== Received: by 10.180.94.102 with SMTP id db6mr5775115wib.20.1349472809969; Fri, 05 Oct 2012 14:33:29 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id v3sm5048951wiy.5.2012.10.05.14.33.28 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 14:33:29 -0700 (PDT) From: Peter Senna Tschudin To: samuel@sortiz.org Cc: irda-users@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 8/20 V2] drivers/net/irda/pxaficp_ir.c: fix error return code Date: Fri, 5 Oct 2012 23:33:05 +0200 Message-Id: <1349472786-10921-4-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349472786-10921-1-git-send-email-peter.senna@gmail.com> References: <1349472786-10921-1-git-send-email-peter.senna@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Peter Senna Tschudin The function pxa_irda_probe() return 0 for success and negative value for most of its internal tests failures. There is one exception that is error case going to err_mem_3:. For this error case, the function abort its success execution path, but returns non negative value, making it difficult for a caller function to notice the error. This patch fixes the error case that do not return negative value. This was found by Coccinelle, but the code change was made by hand. This patch is not robot generated. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // ( if@p1 (\(ret < 0\|ret != 0\)) { ... return ret; } | ret@p1 = 0 ) ... when != ret = e1 when != &ret *if(...) { ... when != ret = e2 when forall return ret; } // Signed-off-by: Peter Senna Tschudin --- Change from V1: Updated commit message. See: http://www.kernelhub.org/?p=2&msg=139319 drivers/net/irda/pxaficp_ir.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 002a442..858de05 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c @@ -846,8 +846,10 @@ static int pxa_irda_probe(struct platform_device *pdev) goto err_mem_2; dev = alloc_irdadev(sizeof(struct pxa_irda)); - if (!dev) + if (!dev) { + err = -ENOMEM; goto err_mem_3; + } SET_NETDEV_DEV(dev, &pdev->dev); si = netdev_priv(dev);