| Message ID | 20220628140249.1073809-1-yangyingliang@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-next,1/2] soc: fsl: guts: fix return value check in fsl_guts_init() | expand |
Am 2022-06-28 16:02, schrieb Yang Yingliang: > In case of error, of_iomap() returns NULL pointer not ERR_PTR(). > The IS_ERR() test in the return value check should be replaced > with NULL test and return -ENOMEM as error value. > > Fixes: ab4988d6a393 ("soc: fsl: guts: embed fsl_guts_get_svr() in > probe()") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Thanks! Reviewed-by: Michael Walle <michael@walle.cc>
On Tue, Jun 28, 2022 at 10:02:48PM +0800, Yang Yingliang wrote: > In case of error, of_iomap() returns NULL pointer not ERR_PTR(). > The IS_ERR() test in the return value check should be replaced > with NULL test and return -ENOMEM as error value. > > Fixes: ab4988d6a393 ("soc: fsl: guts: embed fsl_guts_get_svr() in probe()") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> Applied both, thanks!
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 27035de062f8..8038c599ad83 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c @@ -195,9 +195,9 @@ static int __init fsl_guts_init(void) soc_data = match->data; regs = of_iomap(np, 0); - if (IS_ERR(regs)) { + if (!regs) { of_node_put(np); - return PTR_ERR(regs); + return -ENOMEM; } little_endian = of_property_read_bool(np, "little-endian");
In case of error, of_iomap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test and return -ENOMEM as error value. Fixes: ab4988d6a393 ("soc: fsl: guts: embed fsl_guts_get_svr() in probe()") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com> --- drivers/soc/fsl/guts.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)