From: Greg Kroah-Hartman Date: Tue, 10 Sep 2024 09:22:13 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.19.322~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e7bd48763e33d6652458539562c5453dc902920c;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: cx82310_eth-fix-error-return-code-in-cx82310_bind.patch --- diff --git a/queue-5.4/cx82310_eth-fix-error-return-code-in-cx82310_bind.patch b/queue-5.4/cx82310_eth-fix-error-return-code-in-cx82310_bind.patch new file mode 100644 index 00000000000..63d3b844e5b --- /dev/null +++ b/queue-5.4/cx82310_eth-fix-error-return-code-in-cx82310_bind.patch @@ -0,0 +1,34 @@ +From cfbaa8b33e022aca62a3f2815ffbc02874d4cb8b Mon Sep 17 00:00:00 2001 +From: Zhang Changzhong +Date: Fri, 13 Nov 2020 14:07:07 +0800 +Subject: cx82310_eth: fix error return code in cx82310_bind() + +From: Zhang Changzhong + +commit cfbaa8b33e022aca62a3f2815ffbc02874d4cb8b upstream. + +Fix to return a negative error code from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: ca139d76b0d9 ("cx82310_eth: re-enable ethernet mode after router reboot") +Reported-by: Hulk Robot +Signed-off-by: Zhang Changzhong +Link: https://lore.kernel.org/r/1605247627-15385-1-git-send-email-zhangchangzhong@huawei.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/cx82310_eth.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/usb/cx82310_eth.c ++++ b/drivers/net/usb/cx82310_eth.c +@@ -201,7 +201,8 @@ static int cx82310_bind(struct usbnet *d + } + + /* enable ethernet mode (?) */ +- if (cx82310_enable_ethernet(dev)) ++ ret = cx82310_enable_ethernet(dev); ++ if (ret) + goto err; + + /* get the MAC address */ diff --git a/queue-5.4/series b/queue-5.4/series index 64e2318480d..e8046f225e4 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -118,3 +118,4 @@ drm-i915-fence-mark-debug_fence_init_onstack-with-__.patch drm-i915-fence-mark-debug_fence_free-with-__maybe_un.patch rtmutex-drop-rt_mutex-wait_lock-before-scheduling.patch net-sunrpc-remap-eperm-in-case-of-connection-failure-in-xs_tcp_setup_socket.patch +cx82310_eth-fix-error-return-code-in-cx82310_bind.patch