]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
firmware: Google VPD: Fix return value check in vpd_platform_init()
authorWei Yongjun <weiyongjun1@huawei.com>
Wed, 26 Apr 2017 13:42:52 +0000 (13:42 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Apr 2017 20:54:54 +0000 (22:54 +0200)
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>
drivers/firmware/google/vpd.c

index 619f4bae474fb7f9d7e8b6181847929edf9152e8..3ce813110d5e11bca8f3ea3e87c50cd32562b930 100644 (file)
@@ -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)