aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/realtek
diff options
context:
space:
mode:
authorHeiner Kallweit <hkallweit1@gmail.com>2021-01-08 12:57:57 +0100
committerJakub Kicinski <kuba@kernel.org>2021-01-09 18:07:52 -0800
commit5f1e1224d660bbf3f571d6fd8a729e42f5914eef (patch)
treeef1f9d09633e35ad07d6b9cf4df11e6d40a9e72b /drivers/net/ethernet/realtek
parentnet: dsa: dsa_legacy_fdb_{add,del} can be static (diff)
downloadlinux-dev-5f1e1224d660bbf3f571d6fd8a729e42f5914eef.tar.xz
linux-dev-5f1e1224d660bbf3f571d6fd8a729e42f5914eef.zip
r8169: replace BUG_ON with WARN in _rtl_eri_write
Use WARN here to avoid stopping the system. In addition print the addr and mask values that triggered the warning. v2: - return on WARN to avoid an invalid register write Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/realtek')
-rw-r--r--drivers/net/ethernet/realtek/r8169_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index c9abc7ccbb6f..317b34723ba0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -763,7 +763,9 @@ static void _rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask,
{
u32 cmd = ERIAR_WRITE_CMD | type | mask | addr;
- BUG_ON((addr & 3) || (mask == 0));
+ if (WARN(addr & 3 || !mask, "addr: 0x%x, mask: 0x%08x\n", addr, mask))
+ return;
+
RTL_W32(tp, ERIDR, val);
r8168fp_adjust_ocp_cmd(tp, &cmd, type);
RTL_W32(tp, ERIAR, cmd);