[ 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);
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
linux-stable-mirror@lists.linaro.org