summaryrefslogtreecommitdiff
path: root/drivers/platform
diff options
context:
space:
mode:
authorLu Wei <luwei32@huawei.com>2020-07-10 12:30:17 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-19 09:14:49 +0300
commitd5c4d84c95198da37445918013abd9d6bf9a0e02 (patch)
treee76bf1760ebb169fa0d7fbb484ee44c02432fe89 /drivers/platform
parentc0603524c0985073818117fee7403aa14486fec8 (diff)
downloadlinux-d5c4d84c95198da37445918013abd9d6bf9a0e02.tar.xz
platform/x86: intel-hid: Fix return value check in check_acpi_dev()
[ Upstream commit 71fbe886ce6dd0be17f20aded9c63fe58edd2806 ] 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: ecc83e52b28c ("intel-hid: new hid event driver for hotkeys") 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>
Diffstat (limited to 'drivers/platform')
-rw-r--r--drivers/platform/x86/intel-hid.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/intel-hid.c b/drivers/platform/x86/intel-hid.c
index c514cb73bb50..d7d69eadb9bb 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -564,7 +564,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-hid: created platform device\n");