Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e95f8a authored by Gustavo A. R. Silva's avatar Gustavo A. R. Silva Committed by Greg Kroah-Hartman
Browse files

staging: most: hdm-dim2: fix error return code in dim2_probe() 

platform_get_irq() returns an error code, but the dim2_hdm driver
ignores it and always returns -ENODEV. This is not correct and,
prevents -EPROBE_DEFER from being propagated properly.

Also, notice that platform_get_irq() no longer returns 0 on error:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=e330b9a6bb35dc7097a4f02cb1ae7b6f96df92af



Print and propagate the return value of platform_get_irq on failure.

This issue was detected with the help of Coccinelle.

Signed-off-by: default avatarGustavo A. R. Silva <gustavo@embeddedor.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e0384407

drivers/staging/most/hdm-dim2/dim2_hdm.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -761,8 +761,8 @@ static int dim2_probe(struct platform_device *pdev) 




	irq = platform_get_irq(pdev, 0);

	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

	if (irq < 0) {

		dev_err(&pdev->dev, "failed to get ahb0_int irq\n");

		dev_err(&pdev->dev, "failed to get ahb0_int irq: %d\n", irq);

		return -ENODEV;

		return irq;

	}

	}





	ret = devm_request_irq(&pdev->dev, irq, dim2_ahb_isr, 0,

	ret = devm_request_irq(&pdev->dev, irq, dim2_ahb_isr, 0,
@@ -774,8 +774,8 @@ static int dim2_probe(struct platform_device *pdev) 




	irq = platform_get_irq(pdev, 1);

	irq = platform_get_irq(pdev, 1);

	if (irq < 0) {

	if (irq < 0) {

		dev_err(&pdev->dev, "failed to get mlb_int irq\n");

		dev_err(&pdev->dev, "failed to get mlb_int irq: %d\n", irq);

		return -ENODEV;

		return irq;

	}

	}





	ret = devm_request_irq(&pdev->dev, irq, dim2_mlb_isr, 0,

	ret = devm_request_irq(&pdev->dev, irq, dim2_mlb_isr, 0,