| Message ID | d080038c-eb6b-45ac-9237-b8c1cdd7870f@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 97e176fcbbf3c0f2bd410c9b241177c051f57176 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] r8169: add missing conditional compiling for call to r8169_remove_leds | expand |
Applied the patch and verified the reported issue. Kernel compilation is successful on PowerPC with this patch. Tested-By: Venkat Rao Bagalkote <venkat88@linux.vnet.ibm.com> On 10/04/24 6:41 pm, Heiner Kallweit wrote: > 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> > --- > 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 06631a0d6..746ef4f34 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -5046,7 +5046,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); >
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Wed, 10 Apr 2024 15:11:28 +0200 you wrote: > 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> > > [...] Here is the summary with links: - [net] r8169: add missing conditional compiling for call to r8169_remove_leds https://git.kernel.org/netdev/net/c/97e176fcbbf3 You are awesome, thank you!
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index 06631a0d6..746ef4f34 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -5046,7 +5046,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);
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> --- drivers/net/ethernet/realtek/r8169_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)