Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aecff719 authored by Thomas Preisner's avatar Thomas Preisner Committed by Greg Kroah-Hartman
Browse files

net: 3com: typhoon: typhoon_init_one: fix incorrect return values 


[ 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: default avatarPan Bian <bianpan2016@163.com>
Signed-off-by: default avatarThomas Preisner <thomas.preisner+linux@fau.de>
Signed-off-by: default avatarMilan Stephan <milan.stephan+linux@fau.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@verizon.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent cbbe150d

drivers/net/ethernet/3com/typhoon.c

+6 −3
Original line number Diff line number Diff line
@@ -2400,6 +2400,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;

	}
@@ -2407,7 +2408,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;

	}
@@ -2449,7 +2451,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;

	}