aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch
diff options
context:
space:
mode:
authorJohn Audia <graysky@archlinux.us>2022-03-28 07:54:20 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-03-30 18:33:38 +0200
commitc41da167d21612916376c9125e8c75ed6fe706fe (patch)
treef1197dd9c9fd9a13a0473d41c5fc3056dca2ccc6 /target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch
parent34567750db2c3a84fc9f971189c223e2eefd93b0 (diff)
downloadupstream-c41da167d21612916376c9125e8c75ed6fe706fe.tar.gz
upstream-c41da167d21612916376c9125e8c75ed6fe706fe.tar.bz2
upstream-c41da167d21612916376c9125e8c75ed6fe706fe.zip
kernel: bump 5.10 to 5.10.109
All patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch')
-rw-r--r--target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch b/target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch
index 5bc4e2b0a1..4f754bc69e 100644
--- a/target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch
+++ b/target/linux/generic/backport-5.10/787-v5.12-r8152-check-if-the-pointer-of-the-function-exists.patch
@@ -15,7 +15,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
-@@ -5758,6 +5758,9 @@ static int rtl8152_runtime_suspend(struc
+@@ -5735,6 +5735,9 @@ static int rtl8152_runtime_suspend(struc
struct net_device *netdev = tp->netdev;
int ret = 0;
@@ -25,7 +25,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
set_bit(SELECTIVE_SUSPEND, &tp->flags);
smp_mb__after_atomic();
-@@ -6157,6 +6160,11 @@ rtl_ethtool_get_eee(struct net_device *n
+@@ -6134,6 +6137,11 @@ rtl_ethtool_get_eee(struct net_device *n
struct r8152 *tp = netdev_priv(net);
int ret;
@@ -37,7 +37,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
ret = usb_autopm_get_interface(tp->intf);
if (ret < 0)
goto out;
-@@ -6179,6 +6187,11 @@ rtl_ethtool_set_eee(struct net_device *n
+@@ -6156,6 +6164,11 @@ rtl_ethtool_set_eee(struct net_device *n
struct r8152 *tp = netdev_priv(net);
int ret;