From 770ce2b5d629f0d26164dae72e870e04a0453811 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri@ti.com>
Date: Tue, 6 Nov 2012 00:19:15 -0600
Subject: [PATCH] --- yaml --- r: 344627 b: refs/heads/master c:
 d18bc45543f5a7571fec2465651c9e88c6d555eb h: refs/heads/master i:   344625:
 a75d834cd057125c222363a0640a203d00842aa2   344623:
 1cc3c99ab812bc3b866513b4369af4e75e96ebc0 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/omap2/dss/hdmi.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 52be4f4ac1d0..16d2c454a716 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66a06b0c5997fd45eb22c18e8343a3d3865fd5a1
+refs/heads/master: d18bc45543f5a7571fec2465651c9e88c6d555eb
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index 31cedbb9f9fd..edc28842b9fd 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -1025,6 +1025,7 @@ static void __init hdmi_probe_pdata(struct platform_device *pdev)
 	r = dss_add_device(dssdev);
 	if (r) {
 		DSSERR("device %s register failed: %d\n", dssdev->name, r);
+		hdmi_uninit_display(dssdev);
 		dss_put_device(dssdev);
 		return;
 	}