aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/video/fbdev/pxa168fb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/pxa168fb.c b/drivers/video/fbdev/pxa168fb.c
index def3a501acd6..d059d04c63ac 100644
--- a/drivers/video/fbdev/pxa168fb.c
+++ b/drivers/video/fbdev/pxa168fb.c
@@ -712,7 +712,7 @@ static int pxa168fb_probe(struct platform_device *pdev)
712 /* 712 /*
713 * enable controller clock 713 * enable controller clock
714 */ 714 */
715 clk_enable(fbi->clk); 715 clk_prepare_enable(fbi->clk);
716 716
717 pxa168fb_set_par(info); 717 pxa168fb_set_par(info);
718 718
@@ -767,7 +767,7 @@ static int pxa168fb_probe(struct platform_device *pdev)
767failed_free_cmap: 767failed_free_cmap:
768 fb_dealloc_cmap(&info->cmap); 768 fb_dealloc_cmap(&info->cmap);
769failed_free_clk: 769failed_free_clk:
770 clk_disable(fbi->clk); 770 clk_disable_unprepare(fbi->clk);
771failed_free_fbmem: 771failed_free_fbmem:
772 dma_free_coherent(fbi->dev, info->fix.smem_len, 772 dma_free_coherent(fbi->dev, info->fix.smem_len,
773 info->screen_base, fbi->fb_start_dma); 773 info->screen_base, fbi->fb_start_dma);
@@ -807,7 +807,7 @@ static int pxa168fb_remove(struct platform_device *pdev)
807 dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len), 807 dma_free_wc(fbi->dev, PAGE_ALIGN(info->fix.smem_len),
808 info->screen_base, info->fix.smem_start); 808 info->screen_base, info->fix.smem_start);
809 809
810 clk_disable(fbi->clk); 810 clk_disable_unprepare(fbi->clk);
811 811
812 framebuffer_release(info); 812 framebuffer_release(info);
813 813