[PATCH 5.11 194/254] platform/x86: dell-wmi-sysman: Make sysman_init() return -ENODEV of the interfaces are not found

[Greg Kroah-Hartman]

From: Hans de Goede <hdego...@redhat.com>

[ Upstream commit 32418dd58c957f8fef25b97450d00275967604f1 ]

When either the attributes or the password interface is not found, then
unregister the 2 wmi drivers again and return -ENODEV from sysman_init().

Fixes: e8a60aa7404b ("platform/x86: Introduce support for Systems Management 
Driver over WMI for Dell Systems")
Cc: Divya Bharathi <divya_bhara...@dell.com>
Cc: Mario Limonciello <mario.limoncie...@dell.com>
Reported-by: Alexander Naumann <alexandernaum...@gmx.de>
Signed-off-by: Hans de Goede <hdego...@redhat.com>
Link: https://lore.kernel.org/r/20210321115901.35072-7-hdego...@redhat.com
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/platform/x86/dell-wmi-sysman/sysman.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/platform/x86/dell-wmi-sysman/sysman.c 
b/drivers/platform/x86/dell-wmi-sysman/sysman.c
index 99dc2f3bdf49..5dd9b29d939c 100644
--- a/drivers/platform/x86/dell-wmi-sysman/sysman.c
+++ b/drivers/platform/x86/dell-wmi-sysman/sysman.c
@@ -506,15 +506,17 @@ static int __init sysman_init(void)
        }
 
        ret = init_bios_attr_set_interface();
-       if (ret || !wmi_priv.bios_attr_wdev) {
-               pr_debug("failed to initialize set interface\n");
+       if (ret)
                return ret;
-       }
 
        ret = init_bios_attr_pass_interface();
-       if (ret || !wmi_priv.password_attr_wdev) {
-               pr_debug("failed to initialize pass interface\n");
+       if (ret)
                goto err_exit_bios_attr_set_interface;
+
+       if (!wmi_priv.bios_attr_wdev || !wmi_priv.password_attr_wdev) {
+               pr_debug("failed to find set or pass interface\n");
+               ret = -ENODEV;
+               goto err_exit_bios_attr_pass_interface;
        }
 
        ret = class_register(&firmware_attributes_class);
-- 
2.30.1