| Message ID | 20220107073340.GF22086@kili |
|---|---|
| State | Accepted |
| Headers | show |
| Series | rtc: gamecube: Fix an IS_ERR() vs NULL check | expand |
On Fri, Jan 07, 2022 at 10:33:40AM +0300, Dan Carpenter wrote: > The devm_kzalloc() function returns NULL on error, it doesn't return > error pointers. Good catch, thanks! Reviewed-by: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> > > Fixes: 86559400b3ef ("rtc: gamecube: Add a RTC driver for the GameCube, Wii and Wii U") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > --- > drivers/rtc/rtc-gamecube.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/rtc/rtc-gamecube.c b/drivers/rtc/rtc-gamecube.c > index 98128746171e..f717b36f4738 100644 > --- a/drivers/rtc/rtc-gamecube.c > +++ b/drivers/rtc/rtc-gamecube.c > @@ -319,8 +319,8 @@ static int gamecube_rtc_probe(struct platform_device *pdev) > int ret; > > d = devm_kzalloc(dev, sizeof(struct priv), GFP_KERNEL); > - if (IS_ERR(d)) > - return PTR_ERR(d); > + if (!d) > + return -ENOMEM; > > d->iob = devm_platform_ioremap_resource(pdev, 0); > if (IS_ERR(d->iob)) > -- > 2.20.1
On Fri, 7 Jan 2022 10:33:40 +0300, Dan Carpenter wrote: > The devm_kzalloc() function returns NULL on error, it doesn't return > error pointers. > > Applied, thanks! [1/1] rtc: gamecube: Fix an IS_ERR() vs NULL check commit: 900ed72c8a190e8c0b87cb17abc645b8ec713011 Best regards,
diff --git a/drivers/rtc/rtc-gamecube.c b/drivers/rtc/rtc-gamecube.c index 98128746171e..f717b36f4738 100644 --- a/drivers/rtc/rtc-gamecube.c +++ b/drivers/rtc/rtc-gamecube.c @@ -319,8 +319,8 @@ static int gamecube_rtc_probe(struct platform_device *pdev) int ret; d = devm_kzalloc(dev, sizeof(struct priv), GFP_KERNEL); - if (IS_ERR(d)) - return PTR_ERR(d); + if (!d) + return -ENOMEM; d->iob = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(d->iob))
The devm_kzalloc() function returns NULL on error, it doesn't return error pointers. Fixes: 86559400b3ef ("rtc: gamecube: Add a RTC driver for the GameCube, Wii and Wii U") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- drivers/rtc/rtc-gamecube.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)