| From 5532505f5eed8ac18728fe09cc3add8fe8aba54c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Jul 2020 17:30:18 +0800 |
| Subject: platform/x86: intel-vbtn: Fix return value check in check_acpi_dev() |
| |
| From: Lu Wei <luwei32@huawei.com> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/platform/x86/intel-vbtn.c b/drivers/platform/x86/intel-vbtn.c |
| index a05b80955dcdd..5db8b7ad1f5df 100644 |
| --- a/drivers/platform/x86/intel-vbtn.c |
| +++ b/drivers/platform/x86/intel-vbtn.c |
| @@ -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"); |
| |
| -- |
| 2.25.1 |
| |
