aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video/omap2')
-rw-r--r--drivers/video/omap2/dss/hdmi.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index a43ac3f2a48..72ab260cfb2 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -1050,22 +1050,21 @@ static void __exit hdmi_uninit_output(struct platform_device *pdev)
1050/* HDMI HW IP initialisation */ 1050/* HDMI HW IP initialisation */
1051static int __init omapdss_hdmihw_probe(struct platform_device *pdev) 1051static int __init omapdss_hdmihw_probe(struct platform_device *pdev)
1052{ 1052{
1053 struct resource *hdmi_mem; 1053 struct resource *res;
1054 int r; 1054 int r;
1055 1055
1056 hdmi.pdev = pdev; 1056 hdmi.pdev = pdev;
1057 1057
1058 mutex_init(&hdmi.lock); 1058 mutex_init(&hdmi.lock);
1059 1059
1060 hdmi_mem = platform_get_resource(hdmi.pdev, IORESOURCE_MEM, 0); 1060 res = platform_get_resource(hdmi.pdev, IORESOURCE_MEM, 0);
1061 if (!hdmi_mem) { 1061 if (!res) {
1062 DSSERR("can't get IORESOURCE_MEM HDMI\n"); 1062 DSSERR("can't get IORESOURCE_MEM HDMI\n");
1063 return -EINVAL; 1063 return -EINVAL;
1064 } 1064 }
1065 1065
1066 /* Base address taken from platform */ 1066 /* Base address taken from platform */
1067 hdmi.ip_data.base_wp = ioremap(hdmi_mem->start, 1067 hdmi.ip_data.base_wp = ioremap(res->start, resource_size(res));
1068 resource_size(hdmi_mem));
1069 if (!hdmi.ip_data.base_wp) { 1068 if (!hdmi.ip_data.base_wp) {
1070 DSSERR("can't ioremap WP\n"); 1069 DSSERR("can't ioremap WP\n");
1071 return -ENOMEM; 1070 return -ENOMEM;