From 4c8a423f2aee6d02cac6c91d4657f4cc7d3fa10b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Oct 2021 13:12:30 +0200 Subject: [PATCH] 5.14-stable patches added patches: usb-hso-remove-the-bailout-parameter.patch --- queue-5.14/series | 1 + ...usb-hso-remove-the-bailout-parameter.patch | 53 +++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 queue-5.14/usb-hso-remove-the-bailout-parameter.patch diff --git a/queue-5.14/series b/queue-5.14/series index ffe04219879..fcec13b95e5 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -159,3 +159,4 @@ ext4-flush-s_error_work-before-journal-destroy-in-ext4_fill_super.patch hid-u2fzero-ignore-incomplete-packets-without-data.patch net-udp-annotate-data-race-around-udp_sk-sk-corkflag.patch nios2-setup.c-drop-unused-variable-dram_start.patch +usb-hso-remove-the-bailout-parameter.patch diff --git a/queue-5.14/usb-hso-remove-the-bailout-parameter.patch b/queue-5.14/usb-hso-remove-the-bailout-parameter.patch new file mode 100644 index 00000000000..9c0f91d5176 --- /dev/null +++ b/queue-5.14/usb-hso-remove-the-bailout-parameter.patch @@ -0,0 +1,53 @@ +From dcb713d53e2eadf42b878c12a471e74dc6ed3145 Mon Sep 17 00:00:00 2001 +From: Dongliang Mu +Date: Wed, 21 Jul 2021 16:14:57 +0800 +Subject: usb: hso: remove the bailout parameter + +From: Dongliang Mu + +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 +Signed-off-by: David S. Miller +[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 +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/hso.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/drivers/net/usb/hso.c ++++ b/drivers/net/usb/hso.c +@@ -2353,7 +2353,7 @@ static int remove_net_device(struct hso_ + } + + /* 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); +@@ -2376,7 +2376,7 @@ static void hso_free_net_device(struct h + 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); +@@ -3136,7 +3136,7 @@ static void hso_free_interface(struct us + rfkill_unregister(rfk); + rfkill_destroy(rfk); + } +- hso_free_net_device(network_table[i], false); ++ hso_free_net_device(network_table[i]); + } + } + } -- 2.47.3