diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 13:14:30 +0400 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-08-29 13:14:30 +0400 |
| commit | d4a7dbfdf180a656de3eb9e64614e2b991ffaa53 (patch) | |
| tree | f7d0d548004751aea77f63e6fd695faf0785bde0 /drivers/video/msm | |
| parent | b5480ed72e4f299c53d1857faaf4f492650ccc43 (diff) | |
| parent | fa514fbc57419505d0e9423dbb8742f2775f882e (diff) | |
| download | linux-d4a7dbfdf180a656de3eb9e64614e2b991ffaa53.tar.xz | |
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
Diffstat (limited to 'drivers/video/msm')
| -rw-r--r-- | drivers/video/msm/mdp.c | 4 |
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: |