media: allegro: Fix some NULL vs IS_ERR() checks in probe
Subsystems (3)
PATCH 1/1 media: allegro: Fix some NULL vs IS_ERR() checks in probe
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 <[email protected]>
--- drivers/staging/media/allegro-dvt/allegro-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/staging/media/allegro-dvt/allegro-core.c +4 -4
@@ -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);
Signature · 1 line
2.27.0
Quoted 5 lines · Dan Carpenter
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 <[email protected]>
Reviewed-by Michael Tretter <[email protected]>
Quoted 36 lines
--- drivers/staging/media/allegro-dvt/allegro-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/staging/media/allegro-dvt/allegro-core.c +4
-4@@ -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);Signature · 1 line
2.27.0