summaryrefslogtreecommitdiff
path: root/drivers/mxc/ipu3/ipu_common.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mxc/ipu3/ipu_common.c')
-rw-r--r--drivers/mxc/ipu3/ipu_common.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mxc/ipu3/ipu_common.c b/drivers/mxc/ipu3/ipu_common.c
index 9c47cd91ff3f..563d5320cc9d 100644
--- a/drivers/mxc/ipu3/ipu_common.c
+++ b/drivers/mxc/ipu3/ipu_common.c
@@ -250,6 +250,10 @@ static int __devinit ipu_probe(struct platform_device *pdev)
ipu->dev = &pdev->dev;
+ if (!plat_data->bypass_reset)
+ if (plat_data->init)
+ plat_data->init(pdev->id);
+
ipu->irq_err = platform_get_irq(pdev, 0);
ipu->irq_sync = platform_get_irq(pdev, 1);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -335,9 +339,6 @@ static int __devinit ipu_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, ipu);
if (!plat_data->bypass_reset) {
- if (plat_data->init)
- plat_data->init(pdev->id);
-
ipu_reset(ipu);
ipu_disp_init(ipu);