diff options
| author | Lothar Waßmann <LW@KARO-electronics.de> | 2012-12-25 15:58:37 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-07 12:27:51 -0800 |
| commit | 4d27b2ca154eff58f4d7f34e4cd374c1070a56fc (patch) | |
| tree | 7e24151297e636d8d73f79b93658a07f17bd9ee9 /drivers/staging/imx-drm | |
| parent | 412fc87093df7d40d187f6f167524221ae8080b2 (diff) | |
| download | blackbird-op-linux-4d27b2ca154eff58f4d7f34e4cd374c1070a56fc.tar.gz blackbird-op-linux-4d27b2ca154eff58f4d7f34e4cd374c1070a56fc.zip | |
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: Lothar Waßmann <LW@KARO-electronics.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/imx-drm')
| -rw-r--r-- | 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 677e665ca86d..f7059cddd7fd 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: |
