| From foo@baz Tue Nov 28 10:58:31 CET 2017 |
| From: Thomas Preisner <thomas.preisner+linux@fau.de> |
| Date: Fri, 30 Dec 2016 03:37:53 +0100 |
| Subject: net: 3com: typhoon: typhoon_init_one: fix incorrect return values |
| |
| From: Thomas Preisner <thomas.preisner+linux@fau.de> |
| |
| |
| [ Upstream commit 107fded7bf616ad6f46823d98b8ed6405d7adf2d ] |
| |
| In a few cases the err-variable is not set to a negative error code if a |
| function call in typhoon_init_one() 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> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <alexander.levin@verizon.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/3com/typhoon.c | 9 ++++++--- |
| 1 file changed, 6 insertions(+), 3 deletions(-) |
| |
| --- a/drivers/net/ethernet/3com/typhoon.c |
| +++ b/drivers/net/ethernet/3com/typhoon.c |
| @@ -2398,8 +2398,9 @@ typhoon_init_one(struct pci_dev *pdev, c |
| *(__be16 *)&dev->dev_addr[0] = htons(le16_to_cpu(xp_resp[0].parm1)); |
| *(__be32 *)&dev->dev_addr[2] = htonl(le32_to_cpu(xp_resp[0].parm2)); |
| |
| - 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; |
| } |
| |
| @@ -2407,7 +2408,8 @@ typhoon_init_one(struct pci_dev *pdev, c |
| * 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; |
| } |
| @@ -2449,7 +2451,8 @@ typhoon_init_one(struct pci_dev *pdev, c |
| 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; |
| } |
