From patchwork Fri Oct 5 22:40:54 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: 189619 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 69FB62C0088 for ; Sat, 6 Oct 2012 08:42:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932950Ab2JEWl1 (ORCPT ); Fri, 5 Oct 2012 18:41:27 -0400 Received: from mail-we0-f174.google.com ([74.125.82.174]:44227 "EHLO mail-we0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932931Ab2JEWlX (ORCPT ); Fri, 5 Oct 2012 18:41:23 -0400 Received: by mail-we0-f174.google.com with SMTP id t9so1350726wey.19 for ; Fri, 05 Oct 2012 15:41:22 -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=AvIAd/wR2jJjOW43cglvn6ERjrp4AulbkRryatFsG84=; b=OJ0mjoD3jdVE/HbJi8q5/e4iHIRE0EaIhE1OCTuQZyqcL2V0RSmDGXBKoK2/cNxVnn fBDMaZO3f/0EGNkDYBQvaFYizNJ91eY9+5qSSkxYyBjtBVUG878ReG4l3cgdB+Rgc0n+ XJxt099HgP/oY4WRj+x9lcxMjTNVSbDmcEEK84Am2ofuaYc3WWTsK9E+pCDkLEIaKMCd NopkNT6ebYeOE1ZK5BBBnIYu9Zsa+MOp8+9S8NSzX78bthLnffDd+ErtZEPtOtdyhmbu TRSd3oZmkB5ttZooU+rvAElxgEzlS6iNvXR/XqAwgiVOC1L7MT7ViCLBtjXkHH3cyfxU TrzA== Received: by 10.180.97.35 with SMTP id dx3mr6079155wib.14.1349476882192; Fri, 05 Oct 2012 15:41:22 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id hv8sm5115640wib.0.2012.10.05.15.41.21 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 15:41:21 -0700 (PDT) From: Peter Senna Tschudin To: davem@davemloft.net Cc: jdmason@kudzu.us, gerard.lledo@gmail.com, dhowells@redhat.com, joe@perches.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 18/20 V2] drivers/net/ethernet/sun/sungem.c: fix error return code Date: Sat, 6 Oct 2012 00:40:54 +0200 Message-Id: <1349476856-16075-3-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 gem_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_consistent:. 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/sungem.c | 3 ++- 1 file changed, 2 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/ethernet/sun/sungem.c b/drivers/net/ethernet/sun/sungem.c index 9ae12d0..6c8695e 100644 --- a/drivers/net/ethernet/sun/sungem.c +++ b/drivers/net/ethernet/sun/sungem.c @@ -2963,7 +2963,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev, goto err_out_iounmap; } - if (gem_get_device_address(gp)) + err = gem_get_device_address(gp); + if (err) goto err_out_free_consistent; dev->netdev_ops = &gem_netdev_ops;