summaryrefslogtreecommitdiff
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2016-09-24 11:48:13 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2016-09-24 19:05:25 (GMT)
commit65f7422288cd19c4a9202c4ac7a9cca673b9b2ea (patch)
tree384d5224632b37741f2d7200ac478e45cd2ac317 /arch/x86/platform
parent58cbbee2391ce3876e6eee80a4f2a7f025859c52 (diff)
downloadlinux-65f7422288cd19c4a9202c4ac7a9cca673b9b2ea.tar.xz
x86/platform/mellanox: Fix return value check in mlxplat_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 must therefor be replaced with IS_ERR(). Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Acked-by: Vadim Pasternak <vadimp@mellanox.com> Cc: platform-driver-x86@vger.kernel.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/mellanox/mlx-platform.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/mellanox/mlx-platform.c b/arch/x86/platform/mellanox/mlx-platform.c
index e1dc152..7dcfcca 100644
--- a/arch/x86/platform/mellanox/mlx-platform.c
+++ b/arch/x86/platform/mellanox/mlx-platform.c
@@ -200,8 +200,8 @@ static int __init mlxplat_init(void)
mlxplat_lpc_resources,
ARRAY_SIZE(mlxplat_lpc_resources));
- if (!mlxplat_dev)
- return -ENOMEM;
+ if (IS_ERR(mlxplat_dev))
+ return PTR_ERR(mlxplat_dev);
priv = devm_kzalloc(&mlxplat_dev->dev, sizeof(struct mlxplat_priv),
GFP_KERNEL);