* [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
@ 2018-02-06 12:45 Dan Carpenter
2018-02-06 12:55 ` Vadim Pasternak
0 siblings, 1 reply; 3+ messages in thread
From: Dan Carpenter @ 2018-02-06 12:45 UTC (permalink / raw)
To: Vadim Pasternak
Cc: Darren Hart, Andy Shevchenko, platform-driver-x86,
kernel-janitors
devm_ioport_map() returns NULL on error but we accidentally check for
error pointers instead.
Fixes: c6acad68eb2d ("platform/mellanox: mlxreg-hotplug: Modify to use a regmap interface")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-platform.c
index dfecba4407ac..27de29961f5e 100644
--- a/drivers/platform/x86/mlx-platform.c
+++ b/drivers/platform/x86/mlx-platform.c
@@ -522,8 +522,8 @@ static int __init mlxplat_init(void)
mlxplat_mlxcpld_regmap_ctx.base = devm_ioport_map(&mlxplat_dev->dev,
mlxplat_lpc_resources[1].start, 1);
- if (IS_ERR(mlxplat_mlxcpld_regmap_ctx.base)) {
- err = PTR_ERR(mlxplat_mlxcpld_regmap_ctx.base);
+ if (!mlxplat_mlxcpld_regmap_ctx.base) {
+ err = -ENOMEM;
goto fail_platform_mux_register;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread* RE: [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
2018-02-06 12:45 [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue Dan Carpenter
@ 2018-02-06 12:55 ` Vadim Pasternak
2018-02-06 15:42 ` Darren Hart
0 siblings, 1 reply; 3+ messages in thread
From: Vadim Pasternak @ 2018-02-06 12:55 UTC (permalink / raw)
To: Dan Carpenter
Cc: Darren Hart, Andy Shevchenko, platform-driver-x86@vger.kernel.org,
kernel-janitors@vger.kernel.org
> -----Original Message-----
> From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> Sent: Tuesday, February 06, 2018 2:46 PM
> To: Vadim Pasternak <vadimp@mellanox.com>
> Cc: Darren Hart <dvhart@infradead.org>; Andy Shevchenko
> <andy@infradead.org>; platform-driver-x86@vger.kernel.org; kernel-
> janitors@vger.kernel.org
> Subject: [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
>
> devm_ioport_map() returns NULL on error but we accidentally check for error
> pointers instead.
>
> Fixes: c6acad68eb2d ("platform/mellanox: mlxreg-hotplug: Modify to use a
> regmap interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Vadim Pasternak <vadimp@melanox.com>
>
> diff --git a/drivers/platform/x86/mlx-platform.c b/drivers/platform/x86/mlx-
> platform.c
> index dfecba4407ac..27de29961f5e 100644
> --- a/drivers/platform/x86/mlx-platform.c
> +++ b/drivers/platform/x86/mlx-platform.c
> @@ -522,8 +522,8 @@ static int __init mlxplat_init(void)
>
> mlxplat_mlxcpld_regmap_ctx.base = devm_ioport_map(&mlxplat_dev-
> >dev,
> mlxplat_lpc_resources[1].start, 1);
> - if (IS_ERR(mlxplat_mlxcpld_regmap_ctx.base)) {
> - err = PTR_ERR(mlxplat_mlxcpld_regmap_ctx.base);
> + if (!mlxplat_mlxcpld_regmap_ctx.base) {
> + err = -ENOMEM;
> goto fail_platform_mux_register;
> }
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
2018-02-06 12:55 ` Vadim Pasternak
@ 2018-02-06 15:42 ` Darren Hart
0 siblings, 0 replies; 3+ messages in thread
From: Darren Hart @ 2018-02-06 15:42 UTC (permalink / raw)
To: Vadim Pasternak
Cc: Dan Carpenter, Andy Shevchenko,
platform-driver-x86@vger.kernel.org,
kernel-janitors@vger.kernel.org
On Tue, Feb 06, 2018 at 12:55:58PM +0000, Vadim Pasternak wrote:
>
>
> > -----Original Message-----
> > From: Dan Carpenter [mailto:dan.carpenter@oracle.com]
> > Sent: Tuesday, February 06, 2018 2:46 PM
> > To: Vadim Pasternak <vadimp@mellanox.com>
> > Cc: Darren Hart <dvhart@infradead.org>; Andy Shevchenko
> > <andy@infradead.org>; platform-driver-x86@vger.kernel.org; kernel-
> > janitors@vger.kernel.org
> > Subject: [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue
> >
> > devm_ioport_map() returns NULL on error but we accidentally check for error
> > pointers instead.
> >
> > Fixes: c6acad68eb2d ("platform/mellanox: mlxreg-hotplug: Modify to use a
> > regmap interface")
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
>
> Acked-by: Vadim Pasternak <vadimp@melanox.com>
Queued up for today's PR for 4.16. Thanks.
--
Darren Hart
VMware Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-02-06 15:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-06 12:45 [PATCH] platform/x86: mlx-platform: Fix an ERR_PTR vs NULL issue Dan Carpenter
2018-02-06 12:55 ` Vadim Pasternak
2018-02-06 15:42 ` Darren Hart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox