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

Commit 62c5cacb authored by Dongliang Mu's avatar Dongliang Mu Committed by Greg Kroah-Hartman
Browse files

usb: hso: remove the bailout parameter 



commit dcb713d53e2eadf42b878c12a471e74dc6ed3145 upstream.

There are two invocation sites of hso_free_net_device. After
refactoring hso_create_net_device, this parameter is useless.
Remove the bailout in the hso_free_net_device and change the invocation
sites of this function.

Signed-off-by: default avatarDongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarOvidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fe57d53d

drivers/net/usb/hso.c

+3 −3
Original line number Diff line number Diff line
@@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev) 
}



/* Frees our network device */

static void hso_free_net_device(struct hso_device *hso_dev, bool bailout)

static void hso_free_net_device(struct hso_device *hso_dev)

{

	int i;

	struct hso_net *hso_net = dev2net(hso_dev);
@@ -2377,7 +2377,7 @@ static void hso_free_net_device(struct hso_device *hso_dev, bool bailout) 
	kfree(hso_net->mux_bulk_tx_buf);

	hso_net->mux_bulk_tx_buf = NULL;



	if (hso_net->net && !bailout)

	if (hso_net->net)

		free_netdev(hso_net->net);



	kfree(hso_dev);
@@ -3133,7 +3133,7 @@ static void hso_free_interface(struct usb_interface *interface) 
				rfkill_unregister(rfk);

				rfkill_destroy(rfk);

			}

			hso_free_net_device(network_table[i], false);

			hso_free_net_device(network_table[i]);

		}

	}

}