Skip to content

Commit

Permalink
video: s3c-fb: Disable runtime PM in error paths from probe
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown authored and Florian Tobias Schandinat committed Jan 3, 2012
1 parent a2b77dc commit 3500b0b
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/video/s3c-fb.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}

Expand All @@ -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:
Expand All @@ -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));

err_lcd_clk:
pm_runtime_disable(sfb->dev);

if (!sfb->variant.has_clksel) {
clk_disable(sfb->lcd_clk);
clk_put(sfb->lcd_clk);
Expand Down

0 comments on commit 3500b0b

Please sign in to comment.