| Message ID | Y/yAzR6sWvPedLej@kili (mailing list archive) |
|---|---|
| State | Mainlined, archived |
| Headers | show |
| Series | cpufreq: apple-soc: Fix an IS_ERR() vs NULL check | expand |
On Mon, 27 Feb 2023 at 10:16, Dan Carpenter <error27@gmail.com> wrote: > > The of_iomap() function returns NULL if it fails. It never returns > error pointers. Fix the check accordingly. > > Fixes: 6286bbb40576 ("cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states") > Signed-off-by: Dan Carpenter <error27@gmail.com> > --- Nice catch! Reviewed-by: Eric Curtin <ecurtin@redhat.com> Is mise le meas/Regards, Eric Curtin > drivers/cpufreq/apple-soc-cpufreq.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/cpufreq/apple-soc-cpufreq.c b/drivers/cpufreq/apple-soc-cpufreq.c > index c11d22fd84c3..021f423705e1 100644 > --- a/drivers/cpufreq/apple-soc-cpufreq.c > +++ b/drivers/cpufreq/apple-soc-cpufreq.c > @@ -189,8 +189,8 @@ static int apple_soc_cpufreq_find_cluster(struct cpufreq_policy *policy, > *info = match->data; > > *reg_base = of_iomap(args.np, 0); > - if (IS_ERR(*reg_base)) > - return PTR_ERR(*reg_base); > + if (!*reg_base) > + return -ENOMEM; > > return 0; > } > -- > 2.39.1 > >
On Mon, Feb 27, 2023 at 11:26 AM Eric Curtin <ecurtin@redhat.com> wrote: > > On Mon, 27 Feb 2023 at 10:16, Dan Carpenter <error27@gmail.com> wrote: > > > > The of_iomap() function returns NULL if it fails. It never returns > > error pointers. Fix the check accordingly. > > > > Fixes: 6286bbb40576 ("cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states") > > Signed-off-by: Dan Carpenter <error27@gmail.com> > > --- > > Nice catch! > > Reviewed-by: Eric Curtin <ecurtin@redhat.com> Applied as 6.3-rc material, thanks!
diff --git a/drivers/cpufreq/apple-soc-cpufreq.c b/drivers/cpufreq/apple-soc-cpufreq.c index c11d22fd84c3..021f423705e1 100644 --- a/drivers/cpufreq/apple-soc-cpufreq.c +++ b/drivers/cpufreq/apple-soc-cpufreq.c @@ -189,8 +189,8 @@ static int apple_soc_cpufreq_find_cluster(struct cpufreq_policy *policy, *info = match->data; *reg_base = of_iomap(args.np, 0); - if (IS_ERR(*reg_base)) - return PTR_ERR(*reg_base); + if (!*reg_base) + return -ENOMEM; return 0; }
The of_iomap() function returns NULL if it fails. It never returns error pointers. Fix the check accordingly. Fixes: 6286bbb40576 ("cpufreq: apple-soc: Add new driver to control Apple SoC CPU P-states") Signed-off-by: Dan Carpenter <error27@gmail.com> --- drivers/cpufreq/apple-soc-cpufreq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)