Commit 3500b0be authored by Mark Brown's avatar Mark Brown Committed by Florian Tobias Schandinat

video: s3c-fb: Disable runtime PM in error paths from probe

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>
parent a2b77dce
...@@ -1464,7 +1464,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) ...@@ -1464,7 +1464,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
dev_err(dev, "failed to create window %d\n", win); dev_err(dev, "failed to create window %d\n", win);
for (; win >= 0; win--) for (; win >= 0; win--)
s3c_fb_release_win(sfb, sfb->windows[win]); s3c_fb_release_win(sfb, sfb->windows[win]);
goto err_irq; goto err_pm_runtime;
} }
} }
...@@ -1473,7 +1473,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) ...@@ -1473,7 +1473,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
return 0; return 0;
err_irq: err_pm_runtime:
pm_runtime_put_sync(sfb->dev);
free_irq(sfb->irq_no, sfb); free_irq(sfb->irq_no, sfb);
err_ioremap: err_ioremap:
...@@ -1483,6 +1484,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) ...@@ -1483,6 +1484,8 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev)
release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res)); release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res));
err_lcd_clk: err_lcd_clk:
pm_runtime_disable(sfb->dev);
if (!sfb->variant.has_clksel) { if (!sfb->variant.has_clksel) {
clk_disable(sfb->lcd_clk); clk_disable(sfb->lcd_clk);
clk_put(sfb->lcd_clk); clk_put(sfb->lcd_clk);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment