From patchwork Fri Oct 5 22:40:53 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: 189617 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 E80A32C0088 for ; Sat, 6 Oct 2012 08:42:08 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932966Ab2JEWl3 (ORCPT ); Fri, 5 Oct 2012 18:41:29 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:45570 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932929Ab2JEWlW (ORCPT ); Fri, 5 Oct 2012 18:41:22 -0400 Received: by mail-wi0-f178.google.com with SMTP id hr7so1307034wib.1 for ; Fri, 05 Oct 2012 15:41:21 -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=dpdE/LEa+TvebZNqwQ45ot+3+M4xedD2x+tdRkHzsNc=; b=iD1PVyCYxxl4HWfi7BjgPHUM7oDeQv4hks26hgtK74qZD+cFHZizhoYgpGMBG5aZ9C 5Ol6zKo5FIGv6uDaRQDkYU60WhyIivT5RVvr8HghWRjnVOQipAeDKZBQHpn8GmHkFw0b 5udHqmx8LMYcPuZavJQrFiqpfEDdejRFiH5LnPzfirgM/mBdXfu4sJTa677tEvauux4b 1B7ubAp3Uf4agdklvKnvBL+BajpBLPoHk67Q9iFjTkw7YtsR49w0UXuEpnM7uyK7eunh tXZE4fljxb/NLpqe12hE3n8wO2MXb+eIst2tAQraeZq+5C0f3N9C4SPsNO//Kl8qJnrG suOA== Received: by 10.180.83.234 with SMTP id t10mr6103449wiy.7.1349476880838; Fri, 05 Oct 2012 15:41:20 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id hv8sm5115640wib.0.2012.10.05.15.41.19 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 15:41:20 -0700 (PDT) From: Peter Senna Tschudin To: davem@davemloft.net Cc: mcarlson@broadcom.com, eric.dumazet@gmail.com, mchan@broadcom.com, shuah.khan@hp.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 17/20 V2] drivers/net/ethernet/sun/niu.c: fix error return code Date: Sat, 6 Oct 2012 00:40:53 +0200 Message-Id: <1349476856-16075-2-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349476856-16075-1-git-send-email-peter.senna@gmail.com> References: <1349476856-16075-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 niu_pci_init_one() 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_out_free_res:. 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/ethernet/sun/niu.c | 1 + 1 file changed, 1 insertion(+) -- 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/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 8419bf3..275b430 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c @@ -9788,6 +9788,7 @@ static int __devinit niu_pci_init_one(struct pci_dev *pdev, if (!pci_is_pcie(pdev)) { dev_err(&pdev->dev, "Cannot find PCI Express capability, aborting\n"); + err = -ENODEV; goto err_out_free_res; }