From 8f32f7ea6d4cdadb274ada410596a98363ffa916 Mon Sep 17 00:00:00 2001 From: Pritesh Raithatha Date: Wed, 9 May 2012 19:36:46 +0530 Subject: video: tegra: dc: correct dc initialisation sequence -Move _tegra_dc_enable to before irq_request and remove disable_dc_irq. -It will remove warning of "IRQ when DC not powered!". Bug 955184 Change-Id: If9b039f3f1635d92f10bfc54af08101972fc3d57 Signed-off-by: Pritesh Raithatha Reviewed-on: http://git-master/r/101498 Reviewed-by: Simone Willett Tested-by: Simone Willett --- drivers/video/tegra/dc/dc.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'drivers/video/tegra/dc/dc.c') diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 063d12e4714d..e131937ad239 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -3041,6 +3041,11 @@ static int tegra_dc_probe(struct nvhost_device *ndev) dc->ext = NULL; } + mutex_lock(&dc->lock); + if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) + dc->enabled = _tegra_dc_enable(dc); + mutex_unlock(&dc->lock); + /* interrupt handler must be registered before tegra_fb_register() */ if (request_irq(irq, tegra_dc_irq, IRQF_DISABLED, dev_name(&ndev->dev), dc)) { @@ -3049,14 +3054,6 @@ static int tegra_dc_probe(struct nvhost_device *ndev) goto err_put_emc_clk; } - /* hack to balance enable_irq calls in _tegra_dc_enable() */ - disable_dc_irq(dc->irq); - - mutex_lock(&dc->lock); - if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) - dc->enabled = _tegra_dc_enable(dc); - mutex_unlock(&dc->lock); - tegra_dc_create_debugfs(dc); dev_info(&ndev->dev, "probed\n"); -- cgit v1.2.3