Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1547052
| From | Thomas Preisner <thomas.preisner+linux@fau.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v2 2/2] drivers: net: ethernet: 3com: fix return value |
| Date | 2016-12-24 13:10 +0100 |
| Message-ID | <sRTjb-6KI-13@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 |
In some cases the return value of a failing function is not being used
and the function typhoon_init_one() returns another negative error
code instead.
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 | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/3com/typhoon.c b/drivers/net/ethernet/3com/typhoon.c
index c88b88a..8821a24 100644
--- a/drivers/net/ethernet/3com/typhoon.c
+++ b/drivers/net/ethernet/3com/typhoon.c
@@ -2370,9 +2370,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
* 4) Get the hardware address.
* 5) Put the card to sleep.
*/
- if (typhoon_reset(ioaddr, WaitSleep) < 0) {
+ err = typhoon_reset(ioaddr, WaitSleep);
+ if (err < 0) {
err_msg = "could not reset 3XP";
- err = -EIO;
goto error_out_dma;
}
@@ -2386,16 +2386,16 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
typhoon_init_interface(tp);
typhoon_init_rings(tp);
- if(typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST) < 0) {
+ err = typhoon_boot_3XP(tp, TYPHOON_STATUS_WAITING_FOR_HOST);
+ if(err < 0) {
err_msg = "cannot boot 3XP sleep image";
- err = -EIO;
goto error_out_reset;
}
INIT_COMMAND_WITH_RESPONSE(&xp_cmd, TYPHOON_CMD_READ_MAC_ADDRESS);
- if(typhoon_issue_command(tp, 1, &xp_cmd, 1, xp_resp) < 0) {
+ err = typhoon_issue_command(tp, 1, &xp_cmd, 1, xp_resp);
+ if(err < 0) {
err_msg = "cannot read MAC address";
- err = -EIO;
goto error_out_reset;
}
@@ -2430,9 +2430,9 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
if(xp_resp[0].numDesc != 0)
tp->capabilities |= TYPHOON_WAKEUP_NEEDS_RESET;
- if(typhoon_sleep(tp, PCI_D3hot, 0) < 0) {
+ err = typhoon_sleep(tp, PCI_D3hot, 0);
+ if(err < 0) {
err_msg = "cannot put adapter to sleep";
- err = -EIO;
goto error_out_reset;
}
--
2.7.4
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll 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