Message ID | 20200115150303.112627-1-weiyongjun1@huawei.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | EDAC/sifive: fix return value check in ecc_register() | expand |
On Wed, Jan 15, 2020 at 03:03:03PM +0000, Wei Yongjun wrote: > In case of error, the function edac_device_alloc_ctl_info() returns NULL > pointer not ERR_PTR(). The IS_ERR() test in the return value check > should be replaced with NULL test. > > Fixes: 91abaeaaff35 ("EDAC/sifive: Add EDAC platform driver for SiFive SoCs") > Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> > --- > drivers/edac/sifive_edac.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c > index c0cc72a3b2be..3a3dcb14ed99 100644 > --- a/drivers/edac/sifive_edac.c > +++ b/drivers/edac/sifive_edac.c > @@ -54,8 +54,8 @@ static int ecc_register(struct platform_device *pdev) > p->dci = edac_device_alloc_ctl_info(0, "sifive_ecc", 1, "sifive_ecc", > 1, 1, NULL, 0, > edac_device_alloc_index()); > - if (IS_ERR(p->dci)) > - return PTR_ERR(p->dci); > + if (!p->dci) > + return -ENOMEM; > > p->dci->dev = &pdev->dev; > p->dci->mod_name = "Sifive ECC Manager"; Applied, thanks.
diff --git a/drivers/edac/sifive_edac.c b/drivers/edac/sifive_edac.c index c0cc72a3b2be..3a3dcb14ed99 100644 --- a/drivers/edac/sifive_edac.c +++ b/drivers/edac/sifive_edac.c @@ -54,8 +54,8 @@ static int ecc_register(struct platform_device *pdev) p->dci = edac_device_alloc_ctl_info(0, "sifive_ecc", 1, "sifive_ecc", 1, 1, NULL, 0, edac_device_alloc_index()); - if (IS_ERR(p->dci)) - return PTR_ERR(p->dci); + if (!p->dci) + return -ENOMEM; p->dci->dev = &pdev->dev; p->dci->mod_name = "Sifive ECC Manager";
In case of error, the function edac_device_alloc_ctl_info() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 91abaeaaff35 ("EDAC/sifive: Add EDAC platform driver for SiFive SoCs") Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> --- drivers/edac/sifive_edac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)