2024-06-23 17:19:47 +00:00
|
|
|
From 97e176fcbbf3c0f2bd410c9b241177c051f57176 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Heiner Kallweit <hkallweit1@gmail.com>
|
|
|
|
|
Date: Wed, 10 Apr 2024 15:11:28 +0200
|
|
|
|
|
Subject: [PATCH] r8169: add missing conditional compiling for call to
|
|
|
|
|
r8169_remove_leds
|
|
|
|
|
|
|
|
|
|
Add missing dependency on CONFIG_R8169_LEDS. As-is a link error occurs
|
|
|
|
|
if config option CONFIG_R8169_LEDS isn't enabled.
|
|
|
|
|
|
|
|
|
|
Fixes: 19fa4f2a85d7 ("r8169: fix LED-related deadlock on module removal")
|
|
|
|
|
Reported-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
|
|
|
|
|
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
|
|
|
|
|
Tested-By: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
|
|
|
|
|
Link: https://lore.kernel.org/r/d080038c-eb6b-45ac-9237-b8c1cdd7870f@gmail.com
|
|
|
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
|
|
---
|
|
|
|
|
drivers/net/ethernet/realtek/r8169_main.c | 3 ++-
|
|
|
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/net/ethernet/realtek/r8169_main.c
|
|
|
|
|
+++ b/drivers/net/ethernet/realtek/r8169_main.c
|
2024-10-10 20:06:27 +00:00
|
|
|
@@ -5069,7 +5069,8 @@ static void rtl_remove_one(struct pci_de
|
2024-06-23 17:19:47 +00:00
|
|
|
|
|
|
|
|
cancel_work_sync(&tp->wk.work);
|
|
|
|
|
|
|
|
|
|
- r8169_remove_leds(tp->leds);
|
|
|
|
|
+ if (IS_ENABLED(CONFIG_R8169_LEDS))
|
|
|
|
|
+ r8169_remove_leds(tp->leds);
|
|
|
|
|
|
|
|
|
|
unregister_netdev(tp->dev);
|
|
|
|
|
|
