Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-3.x into fbdev-next

Conflicts:
	drivers/video/atmel_lcdfb.c

1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 243d16f09b8a..01fa660764b4 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -421,7 +421,8 @@ int mdp_probe(struct platform_device *pdev)
         clk = clk_get(&pdev->dev, "mdp_clk");
         if (IS_ERR(clk)) {
                 printk(KERN_INFO "mdp: failed to get mdp clk");
-                return PTR_ERR(clk);
+                ret = PTR_ERR(clk);
+                goto error_get_clk;
         }
 
         ret = request_irq(mdp->irq, mdp_isr, IRQF_DISABLED, "msm_mdp", mdp);
@@ -495,6 +496,7 @@ int mdp_probe(struct platform_device *pdev)
 error_device_register:
         free_irq(mdp->irq, mdp);
 error_request_irq:
+error_get_clk:
         iounmap(mdp->base);
 error_get_irq:
 error_ioremap: