diff options
| author |   Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-12-27 14:16:09 +0000 |
|---|---|---|
| committer |   Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2012-01-03 16:00:04 +0000 |
| commit | 3500b0be62c8cc2f93e8022dc70071ec31b067de (patch) | |
| tree | 37d55ac3103e5ea0ca4608cc9a05857925960584 /drivers/video/s3c-fb.c | |
| parent | video: s3c-fb: Use s3c_fb_enable() to enable the framebuffer (diff) | |
| download | linux-dev-3500b0be62c8cc2f93e8022dc70071ec31b067de.tar.xz linux-dev-3500b0be62c8cc2f93e8022dc70071ec31b067de.zip | |
video: s3c-fb: Disable runtime PM in error paths from probe
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/s3c-fb.c')
| -rw-r--r-- | drivers/video/s3c-fb.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index be4c218bb931..2e0eef0a563f 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c @@ -1464,7 +1464,7 @@ static int __devinit s3c_fb_probe(struct platform_device *pdev) dev_err(dev, "failed to create window %d\n", win); for (; win >= 0; 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) return 0; -err_irq: +err_pm_runtime: + pm_runtime_put_sync(sfb->dev); free_irq(sfb->irq_no, sfb); err_ioremap: @@ -1483,6 +1484,8 @@ err_req_region: release_mem_region(sfb->regs_res->start, resource_size(sfb->regs_res)); err_lcd_clk: + pm_runtime_disable(sfb->dev); + if (!sfb->variant.has_clksel) { clk_disable(sfb->lcd_clk); clk_put(sfb->lcd_clk); |