Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754039AbcLYAao (ORCPT ); Sat, 24 Dec 2016 19:30:44 -0500 Received: from faui40.informatik.uni-erlangen.de ([131.188.34.40]:53619 "EHLO faui40.informatik.uni-erlangen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753431AbcLYAam (ORCPT ); Sat, 24 Dec 2016 19:30:42 -0500 From: Thomas Preisner To: sergei.shtylyov@cogentembedded.com Cc: dave@thedillows.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kernel@i4.cs.fau.de, milan.stephan+linux@fau.de, thomas.preisner+linux@fau.de Subject: [PATCH v3 1/2] drivers: net: ethernet: 3com: fix return value Date: Sun, 25 Dec 2016 01:30:21 +0100 Message-Id: <1482625822-19658-2-git-send-email-thomas.preisner+linux@fau.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1482625822-19658-1-git-send-email-thomas.preisner+linux@fau.de> References: <4200be74-f7e7-db6b-a258-8fd178fef369@cogentembedded.com> <1482625822-19658-1-git-send-email-thomas.preisner+linux@fau.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1811 Lines: 49 In a few cases the err-variable is not set to a negative error code if a function call fails and thus 0 is returned instead. It may be better to set err to the appropriate negative error code before returning. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=188841 Reported-by: Pan Bian Signed-off-by: Thomas Preisner Signed-off-by: Milan Stephan --- drivers/net/ethernet/3com/typhoon.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c index a0cacbe..c88b88a 100644 --- a/drivers/net/ethernet/3com/typhoon.c +++ b/drivers/net/ethernet/3com/typhoon.c @@ -2404,6 +2404,7 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) - if(!is_valid_ether_addr(dev->dev_addr)) { + if (!is_valid_ether_addr(dev->dev_addr)) { err_msg = "Could not obtain valid ethernet address, aborting"; + err = -EIO; goto error_out_reset; } @@ -2411,7 +2412,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) * later when we print out the version reported. */ INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_VERSIONS); - if(typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp) < 0) { + err = typhoon_issue_command(tp, 1, &xp_cmd, 3, xp_resp); + if (err < 0) { err_msg = "Could not get Sleep Image version"; goto error_out_reset; } @@ -2453,7 +2455,8 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->features = dev->hw_features | NETIF_F_HW_VLAN_CTAG_RX | NETIF_F_RXCSUM; - if(register_netdev(dev) < 0) { + err = register_netdev(dev); + if (err < 0) { err_msg = "unable to register netdev"; goto error_out_reset; } -- 2.7.4