| Message ID | 1474717693-6191-1-git-send-email-weiyj.lk@gmail.com (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
> -----Original Message----- > From: Wei Yongjun [mailto:weiyj.lk@gmail.com] > Sent: Saturday, September 24, 2016 2:48 PM > To: Vadim Pasternak <vadimp@mellanox.com>; Thomas Gleixner > <tglx@linutronix.de>; Ingo Molnar <mingo@redhat.com>; H. Peter Anvin > <hpa@zytor.com> > Cc: Wei Yongjun <weiyongjun1@huawei.com>; x86@kernel.org; platform- > driver-x86@vger.kernel.org > Subject: [PATCH -next] x86/platform/mellanox: Fix return value check in > mlxplat_init() > > From: Wei Yongjun <weiyongjun1@huawei.com> > > 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(). > > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > arch/x86/platform/mellanox/mlx-platform.c | 4 ++-- > 1 file 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); > Acked-by: Vadim Pasternak <vadimp@mellanox.com> > priv = devm_kzalloc(&mlxplat_dev->dev, sizeof(struct mlxplat_priv), > GFP_KERNEL); -- To unsubscribe from this list: send the line "unsubscribe platform-driver-x86" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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);