diff mbox series

soc: fsl: guts: fix IS_ERR() vs NULL bug

Message ID YsLHCE/ttyl/OeHs@kili (mailing list archive)
State New, archived
Headers show
Series soc: fsl: guts: fix IS_ERR() vs NULL bug | expand

Commit Message

Dan Carpenter July 4, 2022, 10:55 a.m. UTC 
The of_iomap() function returns NULL on failure, it never returns
error pointers.

Fixes: ab4988d6a393 ("soc: fsl: guts: embed fsl_guts_get_svr() in probe()")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/soc/fsl/guts.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Walle July 4, 2022, 11:01 a.m. UTC | #1 
Am 2022-07-04 12:55, schrieb Dan Carpenter:
> The of_iomap() function returns NULL on failure, it never returns
> error pointers.
> 
> Fixes: ab4988d6a393 ("soc: fsl: guts: embed fsl_guts_get_svr() in 
> probe()")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  drivers/soc/fsl/guts.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> 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");

There was already a patch for this:
https://lore.kernel.org/lkml/20220628140249.1073809-1-yangyingliang@huawei.com/

-michael
diff mbox series

Patch

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");