From 1cc3c99ab812bc3b866513b4369af4e75e96ebc0 Mon Sep 17 00:00:00 2001
From: Ricardo Neri <ricardo.neri@ti.com>
Date: Tue, 6 Nov 2012 00:19:11 -0600
Subject: [PATCH] --- yaml --- r: 344623 b: refs/heads/master c:
 af23cb353307c9d69a5d41ce6168c83fe032387d h: refs/heads/master i:   344621:
 3b2ea0a7c96ee22b7037be7207a247d99339fd09   344619:
 fe8fa973e826f1a601e84c24f84aa6b157c872a0   344615:
 cdd4b436808c0e001192a35207925bb62f9eb888   344607:
 8b5cb89ef19e665a66f5706e94522b686f649d0b v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/video/omap2/dss/hdmi.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ccb7e21af7a2..037f71b644b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933ed63405da8f7a76676e9e10491d7f3be269d1
+refs/heads/master: af23cb353307c9d69a5d41ce6168c83fe032387d
diff --git a/trunk/drivers/video/omap2/dss/hdmi.c b/trunk/drivers/video/omap2/dss/hdmi.c
index a43ac3f2a48c..72ab260cfb27 100644
--- a/trunk/drivers/video/omap2/dss/hdmi.c
+++ b/trunk/drivers/video/omap2/dss/hdmi.c
@@ -1050,22 +1050,21 @@ static void __exit hdmi_uninit_output(struct platform_device *pdev)
 /* HDMI HW IP initialisation */
 static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
 {
-	struct resource *hdmi_mem;
+	struct resource *res;
 	int r;
 
 	hdmi.pdev = pdev;
 
 	mutex_init(&hdmi.lock);
 
-	hdmi_mem = platform_get_resource(hdmi.pdev, IORESOURCE_MEM, 0);
-	if (!hdmi_mem) {
+	res = platform_get_resource(hdmi.pdev, IORESOURCE_MEM, 0);
+	if (!res) {
 		DSSERR("can't get IORESOURCE_MEM HDMI\n");
 		return -EINVAL;
 	}
 
 	/* Base address taken from platform */
-	hdmi.ip_data.base_wp = ioremap(hdmi_mem->start,
-						resource_size(hdmi_mem));
+	hdmi.ip_data.base_wp = ioremap(res->start, resource_size(res));
 	if (!hdmi.ip_data.base_wp) {
 		DSSERR("can't ioremap WP\n");
 		return -ENOMEM;