android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: hso: remove the bailout parameter

Browse Source 
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: Dongliang Mu <mudongliangabcd@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
[Backport this cleanup patch to 5.10 and 5.14 in order to keep the
codebase consistent with the 4.14/4.19/5.4 patchseries]
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dongliang Mu 2021-07-21 16:14:57 +08:00 committed by Greg Kroah-Hartman
parent 4ad4852b9a
commit 28f0fdbac0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/usb/hso.c
View File

@ -2354,7 +2354,7 @@ static int remove_net_device(struct hso_device *hso_dev)
} }
/* Frees our network device */ /* 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; int i;
struct hso_net *hso_net = dev2net(hso_dev); 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); kfree(hso_net->mux_bulk_tx_buf);
hso_net->mux_bulk_tx_buf = NULL; hso_net->mux_bulk_tx_buf = NULL;
if (hso_net->net && !bailout) if (hso_net->net)
free_netdev(hso_net->net); free_netdev(hso_net->net);
kfree(hso_dev); kfree(hso_dev);
@ -3137,7 +3137,7 @@ static void hso_free_interface(struct usb_interface *interface)
rfkill_unregister(rfk); rfkill_unregister(rfk);
rfkill_destroy(rfk); rfkill_destroy(rfk);
} }
hso_free_net_device(network_table[i], false); hso_free_net_device(network_table[i]);
} }
} }
} }