On Tue, Dec 25, 2012 at 03:58:37PM +0100, Lothar Waßmann wrote: > ipu_reset() can fail with a timeout. Check the return value and act > appropriately. > > Signed-off-by: Lothar Waßmann <[email protected]>
All: Acked-by: Sascha Hauer <[email protected]> > --- > drivers/staging/imx-drm/ipu-v3/ipu-common.c | 5 ++++- > 1 files changed, 4 insertions(+), 1 deletions(-) > > diff --git a/drivers/staging/imx-drm/ipu-v3/ipu-common.c > b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > index 677e665..f7059cd 100644 > --- a/drivers/staging/imx-drm/ipu-v3/ipu-common.c > +++ b/drivers/staging/imx-drm/ipu-v3/ipu-common.c > @@ -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: > -- > 1.7.2.5 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
