summaryrefslogtreecommitdiffstats
path: root/drivers/platform
diff options
context:
space:
mode:
authorLu Wei <luwei32@huawei.com>2020-07-10 17:30:17 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-21 11:01:57 +0200
commit9a764fa04991eaa76a61dc9225b65990cc7e9c2a (patch)
tree7438e5897425b0c145f4e7694b9bf25067204281 /drivers/platform
parente85de1bc052a98974990f2406c9db8589d02d521 (diff)
downloadlinux-stable-9a764fa04991eaa76a61dc9225b65990cc7e9c2a.tar.gz
linux-stable-9a764fa04991eaa76a61dc9225b65990cc7e9c2a.tar.bz2
linux-stable-9a764fa04991eaa76a61dc9225b65990cc7e9c2a.zip
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 12dbb5063376..a5c645b9e3f2 100644
--- a/drivers/platform/x86/intel-hid.c
+++ b/drivers/platform/x86/intel-hid.c
@@ -264,7 +264,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");