From patchwork Fri Oct 5 22:10:50 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: 189614 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 097DD2C0084 for ; Sat, 6 Oct 2012 08:12:29 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932877Ab2JEWMO (ORCPT ); Fri, 5 Oct 2012 18:12:14 -0400 Received: from mail-wg0-f44.google.com ([74.125.82.44]:56587 "EHLO mail-wg0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757574Ab2JEWLG (ORCPT ); Fri, 5 Oct 2012 18:11:06 -0400 Received: by mail-wg0-f44.google.com with SMTP id dr13so1865641wgb.1 for ; Fri, 05 Oct 2012 15:11:04 -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=YVPXuoGfO4mLLbg7z+RUqdIU29QXmXlFdx4tsJ5pWXM=; b=oqFvXYgaHd1yNAXYKZgSn9iBK6w801z0kT4Z6qQh8ybhgZ701IUSvgifF+mAjwd0+X vFmqt62Vkg6rqdFtxxNhnKudPKMpJLcm6d2I6YSLD0EX2gbrirlb/pLJwFmtUJJ5L8pY yjX8UVB5dsdPSBmEotFjj74Xdmeb670fOHA/YWH7v02aACqOPPEEzG36cK5tW7U5h2ax Zd2JY+mdWzSOtgBf/fyRiG2GWbPv4aW6bvuf/tuwVB6BjirMtzmUvj/LEFCQsJcCeMSH k8etxXRgD5/9uIvEXVex87Zex7LrRVgwvQzYGAsqj3B6gBk+XPoKa8Gr2jLRu6hIbQci UYTQ== Received: by 10.216.136.230 with SMTP id w80mr6286822wei.199.1349475064569; Fri, 05 Oct 2012 15:11:04 -0700 (PDT) Received: from ace.home ([37.175.200.243]) by mx.google.com with ESMTPS id fb20sm5234544wid.1.2012.10.05.15.11.02 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 15:11:03 -0700 (PDT) From: Peter Senna Tschudin To: jitendra.kalsaria@qlogic.com Cc: sony.chacko@qlogic.com, linux-driver@qlogic.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Peter Senna Tschudin Subject: [PATCH 12/20 V2] drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c: fix error return code Date: Sat, 6 Oct 2012 00:10:50 +0200 Message-Id: <1349475053-11464-2-git-send-email-peter.senna@gmail.com> X-Mailer: git-send-email 1.7.11.4 In-Reply-To: <1349475053-11464-1-git-send-email-peter.senna@gmail.com> References: <1349475053-11464-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 qlcnic_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_out_free_netdev:. 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/qlogic/qlcnic/qlcnic_main.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/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 473ce13..24ad17e 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -1601,7 +1601,8 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->netdev = netdev; adapter->pdev = pdev; - if (qlcnic_alloc_adapter_resources(adapter)) + err = qlcnic_alloc_adapter_resources(adapter); + if (err) goto err_out_free_netdev; adapter->dev_rst_time = jiffies;