5.14-stable patches

added patches:
	usb-hso-remove-the-bailout-parameter.patch

diff --git a/queue-5.14/series b/queue-5.14/series
index ffe0421987931d38fafaa2e2ef01833d7919a70c..fcec13b95e5badfd5a5f44d7dbd15122b155cfed 100644 (file)
--- 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 (file)
index 0000000..9c0f91d
--- /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 <mudongliangabcd@gmail.com>
+Date: Wed, 21 Jul 2021 16:14:57 +0800
+Subject: usb: hso: remove the bailout parameter
+
+From: Dongliang Mu <mudongliangabcd@gmail.com>
+
+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>
+---
+ 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]);
+               }
+       }
+ }