From patchwork Fri Oct 5 22:40:56 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: 189618 X-Patchwork-Delegate: davem@davemloft.net 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 8E7AA2C0336 for ; Sat, 6 Oct 2012 08:42:09 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932989Ab2JEWlb (ORCPT ); Fri, 5 Oct 2012 18:41:31 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:35108 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932933Ab2JEWlZ (ORCPT ); Fri, 5 Oct 2012 18:41:25 -0400 Received: by mail-wg0-f44.google.com with SMTP id dr13so1881738wgb.1 for ; Fri, 05 Oct 2012 15:41:24 -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=tuhdZcMz/6d/zrxSBfMkRi80eqPZoMzJoWqg0N5PILg=; b=EZ17VC3gdUKqbBvFIkksdauyrbkr7r62On7WsOg9JiJBkoMcBmotQ2LCPD9ZinwsQi ipoZKigPycH5X6BWA8l0lbAJof7PkNJLiUE8dOEVunj8yQ1z0QOD3OvkYLEDiV/+6S0M Xrp70pgGEwoDIdrwml8wNStrT31qdMZOzaFJj95AqBq7ok+R84WnQt1hGh24pwD5eDGb r1jzopjjeYkaX1LkB4ABuw3uG9JCvtTtyddXYAqCO26LGuCpqBOYwp7Wpnw4jo4ac+f6 +MFGwGkJ57cQujspuTNv77jeWsN2CxcliDCg0HOUDiI5HYDMm3NWm4LXU5RqbKxYzs9g nZRQ== Received: by 10.180.73.76 with SMTP id j12mr6090417wiv.11.1349476884287; Fri, 05 Oct 2012 15:41:24 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id hv8sm5115640wib.0.2012.10.05.15.41.23 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 15:41:23 -0700 (PDT) From: Peter Senna Tschudin To: mlindner@marvell.com Cc: shemminger@vyatta.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 20/20 V2] drivers/net/ethernet/marvell/sky2.c: fix error return code Date: Sat, 6 Oct 2012 00:40:56 +0200 Message-Id: <1349476856-16075-5-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 sky2_probe() return 0 for success and negative value for most of its internal tests failures. There are two exceptions that are error cases going to err_out*:. For this two cases, the function abort its success execution path, but returns non negative value, making it dificult for a caller function to notice the error. This patch fixes the error cases that do not return negative values. 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/marvell/sky2.c | 5 ++++- 1 file changed, 4 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/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index 2b0748d..78946fe 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4924,6 +4924,7 @@ static int __devinit sky2_probe(struct pci_dev *pdev, if (~reg == 0) { dev_err(&pdev->dev, "PCI configuration read error\n"); + err = -EIO; goto err_out; } @@ -4993,8 +4994,10 @@ static int __devinit sky2_probe(struct pci_dev *pdev, hw->st_size = hw->ports * roundup_pow_of_two(3*RX_MAX_PENDING + TX_MAX_PENDING); hw->st_le = pci_alloc_consistent(pdev, hw->st_size * sizeof(struct sky2_status_le), &hw->st_dma); - if (!hw->st_le) + if (!hw->st_le) { + err = -ENOMEM; goto err_out_reset; + } dev_info(&pdev->dev, "Yukon-2 %s chip revision %d\n", sky2_name(hw->chip_id, buf1, sizeof(buf1)), hw->chip_rev);