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

Commit 4d27b2ca authored by Lothar Waßmann's avatar Lothar Waßmann Committed by Greg Kroah-Hartman
Browse files

staging: drm/imx: check return value of ipu_reset() 



ipu_reset() can fail with a timeout. Check the return value and act
appropriately.

Signed-off-by: default avatarLothar Waßmann <LW@KARO-electronics.de>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 412fc870

drivers/staging/imx-drm/ipu-v3/ipu-common.c

+4 −1
Original line number Diff line number Diff line
@@ -1104,7 +1104,9 @@ static int ipu_probe(struct platform_device *pdev) 
	if (ret)

		goto out_failed_irq;



	ipu_reset(ipu);

	ret = ipu_reset(ipu);

	if (ret)

		goto out_failed_reset;



	/* Set MCU_T to divide MCU access window into 2 */

	ipu_cm_write(ipu, 0x00400000L | (IPU_MCU_T_DEFAULT << 18),
@@ -1129,6 +1131,7 @@ failed_add_clients: 
	ipu_submodules_exit(ipu);

failed_submodules_init:

	ipu_irq_exit(ipu);

out_failed_reset:

out_failed_irq:

	clk_disable_unprepare(ipu->clk);

failed_clk_get: