aa2fa2eb76
Manually rebased: bcm53xx/patches-5.10/180-usb-xhci-add-support-for-performing-fake-doorbell.patch All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> [Move gro_skip in 680-NET-skip-GRO-for-foreign-MAC-addresses.patch to old position] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
52 lines
1.3 KiB
Diff
52 lines
1.3 KiB
Diff
From e78b75f5be204a0a235da995d01c778dc282bb42 Mon Sep 17 00:00:00 2001
|
|
From: Hayes Wang <hayeswang@realtek.com>
|
|
Date: Fri, 19 Feb 2021 17:04:41 +0800
|
|
Subject: [PATCH] r8152: check if the pointer of the function exists
|
|
|
|
commit c79515e47935c747282c6ed2ee5b2ef039756eeb upstream.
|
|
|
|
Return error code if autosuspend_en, eee_get, or eee_set don't exist.
|
|
|
|
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/usb/r8152.c | 13 +++++++++++++
|
|
1 file changed, 13 insertions(+)
|
|
|
|
--- a/drivers/net/usb/r8152.c
|
|
+++ b/drivers/net/usb/r8152.c
|
|
@@ -5737,6 +5737,9 @@ static int rtl8152_runtime_suspend(struc
|
|
struct net_device *netdev = tp->netdev;
|
|
int ret = 0;
|
|
|
|
+ if (!tp->rtl_ops.autosuspend_en)
|
|
+ return -EBUSY;
|
|
+
|
|
set_bit(SELECTIVE_SUSPEND, &tp->flags);
|
|
smp_mb__after_atomic();
|
|
|
|
@@ -6136,6 +6139,11 @@ rtl_ethtool_get_eee(struct net_device *n
|
|
struct r8152 *tp = netdev_priv(net);
|
|
int ret;
|
|
|
|
+ if (!tp->rtl_ops.eee_get) {
|
|
+ ret = -EOPNOTSUPP;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
ret = usb_autopm_get_interface(tp->intf);
|
|
if (ret < 0)
|
|
goto out;
|
|
@@ -6158,6 +6166,11 @@ rtl_ethtool_set_eee(struct net_device *n
|
|
struct r8152 *tp = netdev_priv(net);
|
|
int ret;
|
|
|
|
+ if (!tp->rtl_ops.eee_set) {
|
|
+ ret = -EOPNOTSUPP;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
ret = usb_autopm_get_interface(tp->intf);
|
|
if (ret < 0)
|
|
goto out;
|