]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
platform/x86: lenovo-wmi-other: Balance component bind and unbind
authorRong Zhang <i@rong.moe>
Sun, 10 May 2026 04:25:33 +0000 (04:25 +0000)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 11 May 2026 11:29:02 +0000 (14:29 +0300)
When lwmi_om_master_bind() fails, the master device's components are
left bound, with the aggregate device destroyed due to the failure
(found by sashiko.dev [1]).

Balance calls to component_bind_all() and component_unbind_all() when an
error is propagated to the component framework.

No functional change intended.

Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Fixes: edc4b183b794 ("platform/x86: Add Lenovo Other Mode WMI Driver")
Cc: stable@vger.kernel.org
Link: https://sashiko.dev/#/patchset/20260331181208.421552-1-derekjohn.clark%40gmail.com
Signed-off-by: Rong Zhang <i@rong.moe>
Signed-off-by: Derek J. Clark <derekjohn.clark@gmail.com>
Link: https://patch.msgid.link/20260510042546.436874-4-derekjohn.clark@gmail.com
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
drivers/platform/x86/lenovo/wmi-other.c

index ebef3649d0a78dfe45b4655cc3a7f143c0cc2d6c..70fcb8406c274f480a336648e71463e83a680585 100644 (file)
@@ -1070,8 +1070,11 @@ static int lwmi_om_master_bind(struct device *dev)
 
        priv->cd00_list = binder.cd00_list;
        priv->cd01_list = binder.cd01_list;
-       if (!priv->cd00_list || !priv->cd01_list)
+       if (!priv->cd00_list || !priv->cd01_list) {
+               component_unbind_all(dev, NULL);
+
                return -ENODEV;
+       }
 
        lwmi_om_fan_info_collect_cd00(priv);