* [PATCH] media: allegro: Fix some NULL vs IS_ERR() checks in probe
@ 2020-06-19 14:30 Dan Carpenter
2020-07-01 7:06 ` Michael Tretter
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2020-06-19 14:30 UTC (permalink / raw)
To: Michael Tretter
Cc: devel, kernel-janitors, Pengutronix Kernel Team, Hans Verkuil,
Mauro Carvalho Chehab, linux-media
The devm_ioremap() function doesn't return error pointers, it returns
NULL on error.
Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
drivers/staging/media/allegro-dvt/allegro-core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
index 70f133a842dd..3ed66aae741d 100644
--- a/drivers/staging/media/allegro-dvt/allegro-core.c
+++ b/drivers/staging/media/allegro-dvt/allegro-core.c
@@ -3065,9 +3065,9 @@ static int allegro_probe(struct platform_device *pdev)
return -EINVAL;
}
regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
- if (IS_ERR(regs)) {
+ if (!regs) {
dev_err(&pdev->dev, "failed to map registers\n");
- return PTR_ERR(regs);
+ return -ENOMEM;
}
dev->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
&allegro_regmap_config);
@@ -3085,9 +3085,9 @@ static int allegro_probe(struct platform_device *pdev)
sram_regs = devm_ioremap(&pdev->dev,
sram_res->start,
resource_size(sram_res));
- if (IS_ERR(sram_regs)) {
+ if (!sram_regs) {
dev_err(&pdev->dev, "failed to map sram\n");
- return PTR_ERR(sram_regs);
+ return -ENOMEM;
}
dev->sram = devm_regmap_init_mmio(&pdev->dev, sram_regs,
&allegro_sram_config);
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] media: allegro: Fix some NULL vs IS_ERR() checks in probe
2020-06-19 14:30 [PATCH] media: allegro: Fix some NULL vs IS_ERR() checks in probe Dan Carpenter
@ 2020-07-01 7:06 ` Michael Tretter
0 siblings, 0 replies; 2+ messages in thread
From: Michael Tretter @ 2020-07-01 7:06 UTC (permalink / raw)
To: Dan Carpenter
Cc: devel, kernel-janitors, Pengutronix Kernel Team, Hans Verkuil,
Mauro Carvalho Chehab, linux-media
On Fri, 19 Jun 2020 17:30:07 +0300, Dan Carpenter wrote:
> The devm_ioremap() function doesn't return error pointers, it returns
> NULL on error.
>
> Fixes: f20387dfd065 ("media: allegro: add Allegro DVT video IP core driver")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: Michael Tretter <m.tretter@pengutronix.de>
> ---
> drivers/staging/media/allegro-dvt/allegro-core.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/media/allegro-dvt/allegro-core.c b/drivers/staging/media/allegro-dvt/allegro-core.c
> index 70f133a842dd..3ed66aae741d 100644
> --- a/drivers/staging/media/allegro-dvt/allegro-core.c
> +++ b/drivers/staging/media/allegro-dvt/allegro-core.c
> @@ -3065,9 +3065,9 @@ static int allegro_probe(struct platform_device *pdev)
> return -EINVAL;
> }
> regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
> - if (IS_ERR(regs)) {
> + if (!regs) {
> dev_err(&pdev->dev, "failed to map registers\n");
> - return PTR_ERR(regs);
> + return -ENOMEM;
> }
> dev->regmap = devm_regmap_init_mmio(&pdev->dev, regs,
> &allegro_regmap_config);
> @@ -3085,9 +3085,9 @@ static int allegro_probe(struct platform_device *pdev)
> sram_regs = devm_ioremap(&pdev->dev,
> sram_res->start,
> resource_size(sram_res));
> - if (IS_ERR(sram_regs)) {
> + if (!sram_regs) {
> dev_err(&pdev->dev, "failed to map sram\n");
> - return PTR_ERR(sram_regs);
> + return -ENOMEM;
> }
> dev->sram = devm_regmap_init_mmio(&pdev->dev, sram_regs,
> &allegro_sram_config);
> --
> 2.27.0
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-01 7:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-19 14:30 [PATCH] media: allegro: Fix some NULL vs IS_ERR() checks in probe Dan Carpenter
2020-07-01 7:06 ` Michael Tretter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).