summaryrefslogtreecommitdiff
path: root/drivers/firmware/google/vpd.c
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-04-26 13:42:52 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-26 22:54:54 +0200
commit856c634dd204581710157d539a37b7340fb60894 (patch)
treeb5315637172e5273cfebfdf18a42e57510a5aa78 /drivers/firmware/google/vpd.c
parentf563dab41733c0e73202a8a5977b441715dc9946 (diff)
downloadlinux-sh-856c634dd204581710157d539a37b7340fb60894.tar.gz
firmware: Google VPD: Fix return value check in vpd_platform_init()
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 <weiyongjun1@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/google/vpd.c')
-rw-r--r--drivers/firmware/google/vpd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c
index 619f4bae474f..3ce813110d5e 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)