From b42a385a387f6111de94787c41bcbaa2c2c2b8a1 Mon Sep 17 00:00:00 2001 From: Tomi Valkeinen Date: Wed, 13 Feb 2013 12:17:43 +0200 Subject: [PATCH] --- yaml --- r: 371350 b: refs/heads/master c: 002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/omap2/dss/hdmi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c9480ebbf587..137bddbd0954 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27831620a6d1b50d1a09f3a5bb3f1451b937b7ed +refs/heads/master: 002d368deeae2e8f2a081b21e4e3c1e2b4e69d9d diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c index b53de043c03f..04edf325429b 100644 --- a/trunk/drivers/video/omap2/dss/hdmi.c +++ b/trunk/drivers/video/omap2/dss/hdmi.c @@ -1092,6 +1092,8 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev) hdmi.ip_data.pll_offset = HDMI_PLLCTRL; hdmi.ip_data.phy_offset = HDMI_PHY; + hdmi_init_output(pdev); + r = hdmi_panel_init(); if (r) { DSSERR("can't init panel\n"); @@ -1100,8 +1102,6 @@ static int __init omapdss_hdmihw_probe(struct platform_device *pdev) dss_debugfs_create_file("hdmi", hdmi_dump_regs); - hdmi_init_output(pdev); - hdmi_probe_pdata(pdev); return 0;