From: Ricardo Neri <ricardo.neri@ti.com>
Date: Tue, 6 Nov 2012 06:19:15 +0000 (-0600)
Subject: OMAPDSS: HDMI: Uninit display on device add error
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=d18bc45543f5a7571fec2465651c9e88c6d555eb;p=deliverable%2Flinux.git

OMAPDSS: HDMI: Uninit display on device add error

The display must be uninitialized in order to free the requested GPIOs.

Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---

diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index 31cedbb9f9fd..edc28842b9fd 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/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;
 	}