summaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2017-04-25 05:11:48 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-04-26 22:54:54 +0200
commit2a76f89fa58c769241cfc21f2614705591519ae3 (patch)
treeb51e83fce9dde0fead19a1087095208c5a751bc3 /drivers/firmware
parentfirmware: Google VPD: Fix return value check in vpd_platform_init() (diff)
downloadlinux-2a76f89fa58c769241cfc21f2614705591519ae3.tar.xz
linux-2a76f89fa58c769241cfc21f2614705591519ae3.zip
firmware: google memconsole: Fix return value check in platform_memconsole_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: d384d6f43d1e ("firmware: google memconsole: Add coreboot support") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/google/memconsole-coreboot.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/google/memconsole-coreboot.c b/drivers/firmware/google/memconsole-coreboot.c
index 21210144def7..02711114dece 100644
--- a/drivers/firmware/google/memconsole-coreboot.c
+++ b/drivers/firmware/google/memconsole-coreboot.c
@@ -95,8 +95,8 @@ static int __init platform_memconsole_init(void)
struct platform_device *pdev;
pdev = platform_device_register_simple("memconsole", -1, NULL, 0);
- if (pdev == NULL)
- return -ENODEV;
+ if (IS_ERR(pdev))
+ return PTR_ERR(pdev);
platform_driver_register(&memconsole_driver);