From: Thomas Preisner <thomas.preisner+linux@fau.de>
To: dave@thedillows.org
Cc: 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 v2 1/2] drivers: net: ethernet: 3com: fix return value
Date: Sat, 24 Dec 2016 13:02:37 +0100 [thread overview]
Message-ID: <1482580958-15406-2-git-send-email-thomas.preisner+linux@fau.de> (raw)
In-Reply-To: <1482580958-15406-1-git-send-email-thomas.preisner+linux@fau.de>
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
next prev parent reply other threads:[~2016-12-24 12:02 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-23 23:00 [PATCH] drivers: net: ethernet: 3com: fix return value Thomas Preisner
2016-12-24 1:05 ` David Dillow
2016-12-24 12:02 ` Thomas Preisner
2016-12-24 12:02 ` Thomas Preisner [this message]
2016-12-24 19:06 ` [PATCH v2 1/2] " Sergei Shtylyov
2016-12-25 0:30 ` Thomas Preisner
2016-12-25 0:30 ` [PATCH v3 " Thomas Preisner
2016-12-25 0:56 ` David Miller
2016-12-25 0:30 ` [PATCH v3 2/2] " Thomas Preisner
2016-12-25 10:07 ` Sergei Shtylyov
2016-12-27 21:17 ` David Dillow
2016-12-30 2:37 ` Thomas Preisner
2016-12-30 2:37 ` [PATCH v4 1/2] net: 3com: typhoon: typhoon_init_one: fix incorrect return values Thomas Preisner
2016-12-30 20:27 ` David Miller
2016-12-30 2:37 ` [PATCH v4 2/2] net: 3com: typhoon: typhoon_init_one: make return values more specific Thomas Preisner
2016-12-30 20:27 ` David Miller
2016-12-27 21:15 ` Re: [PATCH v2 1/2] drivers: net: ethernet: 3com: fix return value David Dillow
2016-12-24 12:02 ` [PATCH v2 2/2] " Thomas Preisner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1482580958-15406-2-git-send-email-thomas.preisner+linux@fau.de \
--to=thomas.preisner+linux@fau.de \
--cc=dave@thedillows.org \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=milan.stephan+linux@fau.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).