mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 06:33:41 +00:00
0667688a40
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>
(cherry picked from commit aa2fa2eb76)
37 lines
1.1 KiB
Diff
37 lines
1.1 KiB
Diff
From 38e44c7926512cff0b2809dc329de2a8e769e523 Mon Sep 17 00:00:00 2001
|
|
From: Hayes Wang <hayeswang@realtek.com>
|
|
Date: Fri, 19 Feb 2021 17:04:42 +0800
|
|
Subject: [PATCH] r8152: replace netif_err with dev_err
|
|
|
|
commit 156c3207611262266f0eea589ac3f00c5657320e upstream.
|
|
|
|
Some messages are before calling register_netdev(), so replace
|
|
netif_err() with dev_err().
|
|
|
|
Signed-off-by: Hayes Wang <hayeswang@realtek.com>
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/usb/r8152.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/net/usb/r8152.c
|
|
+++ b/drivers/net/usb/r8152.c
|
|
@@ -6596,7 +6596,7 @@ static int rtl_ops_init(struct r8152 *tp
|
|
|
|
default:
|
|
ret = -ENODEV;
|
|
- netif_err(tp, probe, tp->netdev, "Unknown Device\n");
|
|
+ dev_err(&tp->intf->dev, "Unknown Device\n");
|
|
break;
|
|
}
|
|
|
|
@@ -6853,7 +6853,7 @@ static int rtl8152_probe(struct usb_inte
|
|
|
|
ret = register_netdev(netdev);
|
|
if (ret != 0) {
|
|
- netif_err(tp, probe, netdev, "couldn't register the device\n");
|
|
+ dev_err(&intf->dev, "couldn't register the device\n");
|
|
goto out1;
|
|
}
|
|
|