]> www.infradead.org Git - users/dwmw2/linux.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)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 21 Aug 2020 07:48:03 +0000 (09:48 +0200)
[ 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>
drivers/platform/x86/intel-vbtn.c

index 58c5ff36523ab9bc4d570ff781f91cd0d9a433ea..d7fa2b88d27abf758303e0c11127caf9b88ded24 100644 (file)
@@ -178,7 +178,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");