[PATCH v2] platform/x86: ideapad-laptop: Fix driver unregistration order

[PATCH v2] platform/x86: ideapad-laptop: Fix driver unregistration order

[Rong Zhang]

There are two drivers in the ideapad-laptop module: a wmi_driver and a
platform_driver. The former is registered before the latter, but the
unregistration order is the same as the init one instead of the reverse.

Fix the driver unregistration order by reversing it.

Fixes: f32e02417614 ("platform/x86: ideapad-laptop: support for more special keys in WMI")
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Signed-off-by: Rong Zhang <i@rong.moe>
---
Changes in v2:
- Fix a typo in title
- Link to v1: https://patch.msgid.link/20260723-ideapad-rev-exit-v1-1-bf0d8ac9b5ed@rong.moe
---
 drivers/platform/x86/lenovo/ideapad-laptop.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c
index 4fbc904f1fc3..8213524504ee 100644
--- a/drivers/platform/x86/lenovo/ideapad-laptop.c
+++ b/drivers/platform/x86/lenovo/ideapad-laptop.c
@@ -2564,8 +2564,8 @@ module_init(ideapad_laptop_init)
 
 static void __exit ideapad_laptop_exit(void)
 {
-	ideapad_wmi_driver_unregister();
 	platform_driver_unregister(&ideapad_acpi_driver);
+	ideapad_wmi_driver_unregister();
 }
 module_exit(ideapad_laptop_exit)
 

---
base-commit: 248951ddc14de84de3910f9b13f51491a8cd91df
change-id: b0d55ec3-ideapad-rev-exit-381b4a9cb5a4

Thanks,
Rong

Re: [PATCH v2] platform/x86: ideapad-laptop: Fix driver unregistration order

[Ilpo Järvinen]

On Thu, 23 Jul 2026, Rong Zhang wrote:

> There are two drivers in the ideapad-laptop module: a wmi_driver and a
> platform_driver. The former is registered before the latter, but the
> unregistration order is the same as the init one instead of the reverse.
> 
> Fix the driver unregistration order by reversing it.
> 
> Fixes: f32e02417614 ("platform/x86: ideapad-laptop: support for more special keys in WMI")
> Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
> Signed-off-by: Rong Zhang <i@rong.moe>
> ---
> Changes in v2:
> - Fix a typo in title

Perhaps too used to writing "dead" so fingers kept typing... I can never 
type "roof" succesfully myself, my fingers always do "root" instead. :-)

Anyway, I've applied this but took out the Fixes tag, unless you've some 
real bug in mind related to it?

I also added Suggested-by me to take some blame (if necessary).

Thanks for the patch and Mark for review.

-- 
 i.

> - Link to v1: https://patch.msgid.link/20260723-ideapad-rev-exit-v1-1-bf0d8ac9b5ed@rong.moe
> ---
>  drivers/platform/x86/lenovo/ideapad-laptop.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/platform/x86/lenovo/ideapad-laptop.c b/drivers/platform/x86/lenovo/ideapad-laptop.c
> index 4fbc904f1fc3..8213524504ee 100644
> --- a/drivers/platform/x86/lenovo/ideapad-laptop.c
> +++ b/drivers/platform/x86/lenovo/ideapad-laptop.c
> @@ -2564,8 +2564,8 @@ module_init(ideapad_laptop_init)
>  
>  static void __exit ideapad_laptop_exit(void)
>  {
> -	ideapad_wmi_driver_unregister();
>  	platform_driver_unregister(&ideapad_acpi_driver);
> +	ideapad_wmi_driver_unregister();
>  }
>  module_exit(ideapad_laptop_exit)
>  
> 
> ---
> base-commit: 248951ddc14de84de3910f9b13f51491a8cd91df
> change-id: b0d55ec3-ideapad-rev-exit-381b4a9cb5a4
> 
> Thanks,
> Rong
> 

Re: [PATCH v2] platform/x86: ideapad-laptop: Fix driver unregistration order

[Rong Zhang]

Hi Ilpo,

On Fri, 2026-07-24 at 14:54 +0300, Ilpo Järvinen wrote:
> On Thu, 23 Jul 2026, Rong Zhang wrote:
> 
> > There are two drivers in the ideapad-laptop module: a wmi_driver and a
> > platform_driver. The former is registered before the latter, but the
> > unregistration order is the same as the init one instead of the reverse.
> > 
> > Fix the driver unregistration order by reversing it.
> > 
> > Fixes: f32e02417614 ("platform/x86: ideapad-laptop: support for more special keys in WMI")
> > Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
> > Signed-off-by: Rong Zhang <i@rong.moe>
> > ---
> > Changes in v2:
> > - Fix a typo in title
> 
> Perhaps too used to writing "dead" so fingers kept typing... I can never 
> type "roof" succesfully myself, my fingers always do "root" instead. :-)

An ideadl root does not leak on rainy days ;-P

> 
> Anyway, I've applied this but took out the Fixes tag, unless you've some 
> real bug in mind related to it?

Makes sense. It's not buggy as the two driver has no dependency on each
other.

> 
> I also added Suggested-by me to take some blame (if necessary).

Ahh, forgot that!

> 
> Thanks for the patch and Mark for review.

And thanks for reviewing and fixing my patch ;-)

Thanks,
Rong