Merge branch 'develop-3.0' of ssh://rk29/rk/kernel into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / video / msm / mddi.c

diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index 7c316c34dfca50fe3e76be6438c056682eb159ab..178b0720bd79a96d55e6d786fe8a183940263de2 100644 (file)
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -318,7 +318,7 @@ static long mddi_wait_interrupt_timeout(struct mddi_info *mddi,
 static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask)
 {
        if (mddi_wait_interrupt_timeout(mddi, intmask, HZ/10) == 0)
-               printk(KERN_INFO KERN_ERR "mddi_wait_interrupt %d, timeout "
+               printk(KERN_INFO "mddi_wait_interrupt %d, timeout "
                       "waiting for %x, INT = %x, STAT = %x gotint = %x\n",
                       current->pid, intmask, mddi_readl(INT), mddi_readl(STAT),
                       mddi->got_int);
@@ -465,8 +465,7 @@ static int __init mddi_get_client_caps(struct mddi_info *mddi)
 
                if (mddi->flags & FLAG_HAVE_CAPS)
                        break;
-               printk(KERN_INFO KERN_ERR "mddi_init, timeout waiting for "
-                               "caps\n");
+               printk(KERN_INFO "mddi_init, timeout waiting for caps\n");
        }
        return mddi->flags & FLAG_HAVE_CAPS;
 }
@@ -680,7 +679,7 @@ static int __devinit mddi_probe(struct platform_device *pdev)
                printk(KERN_ERR "mddi: no associated mem resource!\n");
                return -ENOMEM;
        }
-       mddi->base = ioremap(resource->start, resource->end - resource->start);
+       mddi->base = ioremap(resource->start, resource_size(resource));
        if (!mddi->base) {
                printk(KERN_ERR "mddi: failed to remap base!\n");
                ret = -EINVAL;