Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1547050

[PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value

From Thomas Preisner <thomas.preisner+linux@fau.de>
Newsgroups linux.kernel
Subject [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value
Date 2016-12-24 13:10 +0100
Message-ID <sRTjb-6KI-1@gated-at.bofh.it> (permalink)
References <sRJa9-6Gi-3@gated-at.bofh.it> <sRTjb-6KI-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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 <bianpan2016@163.com>
Signed-off-by: Thomas Preisner <thomas.preisner+linux@fau.de>
Signed-off-by: Milan Stephan <milan.stephan+linux@fau.de>
---
 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)) {
 		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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-24 00:10 +0100
  Re: [PATCH] drivers: net: ethernet: 3com: fix return value David Dillow <dave@thedillows.org> - 2016-12-24 02:20 +0100
    [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-24 13:10 +0100
      Re: [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-12-24 20:10 +0100
        [PATCH v3 1/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-25 01:40 +0100
          Re: [PATCH v3 1/2] drivers: net: ethernet: 3com: fix return value David Miller <davem@davemloft.net> - 2016-12-25 02:00 +0100
        [PATCH v3 2/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-25 01:40 +0100
          Re: [PATCH v3 2/2] drivers: net: ethernet: 3com: fix return value Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> - 2016-12-25 11:10 +0100
          Re: [PATCH v3 2/2] drivers: net: ethernet: 3com: fix return value David Dillow <dave@thedillows.org> - 2016-12-27 22:20 +0100
            [PATCH v4 1/2] net: 3com: typhoon: typhoon_init_one: fix incorrect return values Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-30 03:40 +0100
              Re: [PATCH v4 1/2] net: 3com: typhoon: typhoon_init_one: fix  incorrect return values David Miller <davem@davemloft.net> - 2016-12-30 21:30 +0100
            [PATCH v4 2/2] net: 3com: typhoon: typhoon_init_one: make return values more specific Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-30 03:40 +0100
              Re: [PATCH v4 2/2] net: 3com: typhoon: typhoon_init_one: make  return values more specific David Miller <davem@davemloft.net> - 2016-12-30 21:30 +0100
            Re: Re: [PATCH v3 2/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-30 03:40 +0100
        Re: Re: [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-25 01:40 +0100
          Re: Re: [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return  value David Dillow <dave@thedillows.org> - 2016-12-27 22:20 +0100
    Re: [PATCH] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-24 13:10 +0100
      [PATCH v2 2/2] drivers: net: ethernet: 3com: fix return value Thomas Preisner <thomas.preisner+linux@fau.de> - 2016-12-24 13:10 +0100

csiph-web