media: rcar_fdp1: Fix the correct variable assignments
[ Upstream commitaf88c2adbb
] 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:c766c90faf
("media: rcar_fdp1: Fix refcount leak in probe and remove function") Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Родитель
3c300022c1
Коммит
825281f34b
|
@ -2287,11 +2287,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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче