2017-04-26 13:43:17

by Wei Yongjun

[permalink] [raw]
Subject: [PATCH -next] firmware: Google VPD: Fix return value check in vpd_platform_init()

From: Wei Yongjun <[email protected]>

In case of error, the function platform_device_register_simple()
returns ERR_PTR() and never returns NULL. The NULL test in the
return value check should be replaced with IS_ERR().

Fixes: 049a59db34eb ("firmware: Google VPD sysfs driver")
Signed-off-by: Wei Yongjun <[email protected]>
---
drivers/firmware/google/vpd.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 619f4ba..3ce8131 100644
--- a/drivers/firmware/google/vpd.c
+++ b/drivers/firmware/google/vpd.c
@@ -303,8 +303,8 @@ static int __init vpd_platform_init(void)
struct platform_device *pdev;

pdev = platform_device_register_simple("vpd", -1, NULL, 0);
- if (!pdev)
- return -ENODEV;
+ if (IS_ERR(pdev))
+ return PTR_ERR(pdev);

vpd_kobj = kobject_create_and_add("vpd", firmware_kobj);
if (!vpd_kobj)