Skip to contentSkip to conversation

r8169: add missing conditional compiling for call to r8169_remove_leds

PATCH In review Heiner Kallweit 2 participants 2 messages Apr 18, 2024 – Apr 19, 2024

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: add missing conditional compiling for call to r8169_remove_leds

[ Upstream commit 97e176fcbbf3c0f2bd410c9b241177c051f57176 ]

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")
Cc <[email protected]> # 6.8.x

---
This for v6.8 only.

---
 drivers/net/ethernet/realtek/r8169_main.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -1
index 2cc1c36ab..32b73f398 100644
@@ -4932,7 +4932,8 @@ static void rtl_remove_one(struct pci_dev *pdev)
 
 	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);
 
Signature · 1 line
2.44.0
maintainer
#1 lore raw
Quoted 11 lines · Heiner Kallweit

[ Upstream commit 97e176fcbbf3c0f2bd410c9b241177c051f57176 ]

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")
Cc <[email protected]> # 6.8.x

---
This for v6.8 only.

Both now queued up, thanks.

greg k-h