* [PATCH] r8169: add missing conditional compiling for call to r8169_remove_leds
@ 2024-04-18 20:36 Heiner Kallweit
2024-04-19 11:17 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Heiner Kallweit @ 2024-04-18 20:36 UTC (permalink / raw)
To: stable@vger.kernel.org
[ 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: <stable@vger.kernel.org> # 6.8.x
Reported-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
This for v6.8 only.
---
drivers/net/ethernet/realtek/r8169_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 2cc1c36ab..32b73f398 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);
--
2.44.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] r8169: add missing conditional compiling for call to r8169_remove_leds
2024-04-18 20:36 [PATCH] r8169: add missing conditional compiling for call to r8169_remove_leds Heiner Kallweit
@ 2024-04-19 11:17 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2024-04-19 11:17 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: stable@vger.kernel.org
On Thu, Apr 18, 2024 at 10:36:26PM +0200, Heiner Kallweit wrote:
> [ 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: <stable@vger.kernel.org> # 6.8.x
> Reported-by: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com>
> Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
> ---
> This for v6.8 only.
Both now queued up, thanks.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-19 11:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-18 20:36 [PATCH] r8169: add missing conditional compiling for call to r8169_remove_leds Heiner Kallweit
2024-04-19 11:17 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox