Skip to contentSkip to conversation

ACPI / platform: Fix return value check in check_acpi_dev()

PATCH Superseded Lu Wei 2 participants 2 messages Jun 5, 2020 – Jul 9, 2020 x86 platform drivers

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Lu Wei

author
#0 lore raw

PATCH v2 1/1 ACPI / platform: Fix return value check in check_acpi_dev()

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)

---
v1->v2
- Modify commit message

 drivers/platform/x86/intel-hid.c  | 2 +-
 drivers/platform/x86/intel-vbtn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/platform/x86/intel-hid.c +1 -1
index cc7dd4d..c45250c 100644
@@ -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");
 
drivers/platform/x86/intel-vbtn.c +1 -1
index b588093..e1aa526 100644
@@ -251,7 +251,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");
 
Signature · 1 line
2.7.4
#1 lore raw
Quoted 5 lines · Lu Wei

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.

Thanks!

Quoted 1 line
Fixes ecc83e52b28c (intel-hid: new hid event driver for hotkeys)

This is not the correct format. Please, fix it in the next version, thanks!

Quoted 2 lines
 drivers/platform/x86/intel-hid.c  | 2 +-
 drivers/platform/x86/intel-vbtn.c | 2 +-

Please, split per driver.

Signature · 2 lines
With Best Regards,
Andy Shevchenko