summaryrefslogtreecommitdiff
path: root/drivers/video/tegra/dc
diff options
context:
space:
mode:
authorRakesh Iyer <riyer@nvidia.com>2013-02-21 11:12:59 -0800
committerSimone Willett <swillett@nvidia.com>2013-02-27 14:18:14 -0800
commitaae23b79fbaff84e9eadb33686d436746dc2c15c (patch)
tree715379856c38b215da2a33c0fe1e95d17fe71e90 /drivers/video/tegra/dc
parentb34390e4aeb97d7a323ea08f1aa3c0476d677df0 (diff)
arm: tegra: roth: fix regulator in initialized mode
Dont skip regulator setup in initialized mode. Bug 1238868 Change-Id: Id23a692488695b9ff9c2f1d147cb2c913b4f3c5b Signed-off-by: Rakesh Iyer <riyer@nvidia.com> Reviewed-on: http://git-master/r/203012 (cherry picked from commit 9c803f9b450cbb71f288501fc5f366166809f382) Reviewed-on: http://git-master/r/204230 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Anshul Jain (SW) <anshulj@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/video/tegra/dc')
-rw-r--r--drivers/video/tegra/dc/dc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c
index 763fa4e2bdf6..7d95885c261a 100644
--- a/drivers/video/tegra/dc/dc.c
+++ b/drivers/video/tegra/dc/dc.c
@@ -4,7 +4,7 @@
* Copyright (C) 2010 Google, Inc.
* Author: Erik Gilling <konkers@android.com>
*
- * Copyright (c) 2010-2012, NVIDIA CORPORATION, All rights reserved.
+ * Copyright (c) 2010-2013, NVIDIA CORPORATION, All rights reserved.
*
* This software is licensed under the terms of the GNU General Public
* License version 2, as published by the Free Software Foundation, and
@@ -1828,8 +1828,7 @@ static bool _tegra_dc_controller_enable(struct tegra_dc *dc)
tegra_dc_unpowergate_locked(dc);
- if (!(dc->out->flags & TEGRA_DC_OUT_INITIALIZED_MODE) &&
- dc->out->enable)
+ if (dc->out->enable)
dc->out->enable(&dc->ndev->dev);
tegra_dc_setup_clk(dc, dc->clk);