|
@@ -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;
|