]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
platform/x86: intel-vbtn: Fix return value check in check_acpi_dev()
authorLu Wei <luwei32@huawei.com>
Fri, 10 Jul 2020 09:30:18 +0000 (17:30 +0800)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Fri, 4 Sep 2020 19:28:57 +0000 (16:28 -0300)
BugLink: https://bugs.launchpad.net/bugs/1892417
[ Upstream commit 64dd4a5a7d214a07e3d9f40227ec30ac8ba8796e ]

In the function check_acpi_dev(), if it fails to create
platform device, the return value is ERR_PTR() or NULL.
Thus it must use IS_ERR_OR_NULL() to check return value.

Fixes: 332e081225fc ("intel-vbtn: new driver for Intel Virtual Button")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Lu Wei <luwei32@huawei.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kelsey Skunberg <kelsey.skunberg@canonical.com>
drivers/platform/x86/intel-vbtn.c

index cb2a80fdd8f4689f93d325bbd26c1d14ecf8995e..3393ee95077f6c0c7f23c1a53523ca0c3f25ce11 100644 (file)
@@ -286,7 +286,7 @@ check_acpi_dev(acpi_handle handle, u32 lvl, void *context, void **rv)
                return AE_OK;
 
        if (acpi_match_device_ids(dev, ids) == 0)
-               if (acpi_create_platform_device(dev, NULL))
+               if (!IS_ERR_OR_NULL(acpi_create_platform_device(dev, NULL)))
                        dev_info(&dev->dev,
                                 "intel-vbtn: created platform device\n");