Commit 6fd6e2f2 authored Oct 21, 2021 by Tang Bin Committed by Greg Kroah-Hartman May 17, 2023

media: rcar_fdp1: Fix the correct variable assignments



[ Upstream commit af88c2adbb72a09ab1bb5c37ba388c98fecca69b ]

In the function fdp1_probe(), when get irq failed, the
function platform_get_irq() log an error message, so
remove redundant message here. And the variable type
of "ret" is int, the "fdp1->irq" is unsigned int, when
irq failed, this place maybe wrong, thus fix it.

Signed-off-by: Tang Bin <tangbin@cmss.chinamobile.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Kieran Bingham <kieran.bingham+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Stable-dep-of: c766c90faf93 ("media: rcar_fdp1: Fix refcount leak in probe and remove function")
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 75b55a3c

drivers/media/platform/rcar_fdp1.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -2291,11 +2291,10 @@ static int fdp1_probe(struct platform_device *pdev)
		return PTR_ERR(fdp1->regs);

		/* Interrupt service routine registration */
		fdp1->irq = ret = platform_get_irq(pdev, 0);
		if (ret < 0) {
		dev_err(&pdev->dev, "cannot find IRQ\n");
		ret = platform_get_irq(pdev, 0);
		if (ret < 0)
		return ret;
		}
		fdp1->irq = ret;

		ret = devm_request_irq(&pdev->dev, fdp1->irq, fdp1_irq_handler, 0,
		dev_name(&pdev->dev), fdp1);