From 8bd060e546c9c7f4296caca52ea35a3ccd2c953a Mon Sep 17 00:00:00 2001 From: Shashank Sharma Date: Fri, 21 Dec 2012 12:50:35 +0530 Subject: arm: tegra: fb: Fix merge error Fix manual rebase error Change-Id: I3b2165488b11bddda271cecdc979341c130def9b Signed-off-by: Shashank Sharma Reviewed-on: http://git-master/r/173554 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Winnie Hsu --- drivers/video/tegra/dc/dc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'drivers/video') diff --git a/drivers/video/tegra/dc/dc.c b/drivers/video/tegra/dc/dc.c index 13e094a7003b..bfd916e0e16e 100644 --- a/drivers/video/tegra/dc/dc.c +++ b/drivers/video/tegra/dc/dc.c @@ -1842,10 +1842,8 @@ static int tegra_dc_probe(struct nvhost_device *ndev, disable_dc_irq(irq); mutex_lock(&dc->lock); - if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) { - _tegra_dc_set_default_videomode(dc); + if (dc->pdata->flags & TEGRA_DC_FLAG_ENABLED) dc->enabled = _tegra_dc_enable(dc); - } mutex_unlock(&dc->lock); tegra_dc_create_debugfs(dc); -- cgit v1.2.3