diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/fbdev/s3c2410fb.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/video/fbdev/s3c2410fb.c b/drivers/video/fbdev/s3c2410fb.c index 81af5a63e9e1..d68595dcc5fd 100644 --- a/drivers/video/fbdev/s3c2410fb.c +++ b/drivers/video/fbdev/s3c2410fb.c | |||
@@ -932,7 +932,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, | |||
932 | goto release_irq; | 932 | goto release_irq; |
933 | } | 933 | } |
934 | 934 | ||
935 | clk_enable(info->clk); | 935 | clk_prepare_enable(info->clk); |
936 | dprintk("got and enabled clock\n"); | 936 | dprintk("got and enabled clock\n"); |
937 | 937 | ||
938 | usleep_range(1000, 1100); | 938 | usleep_range(1000, 1100); |
@@ -996,7 +996,7 @@ static int s3c24xxfb_probe(struct platform_device *pdev, | |||
996 | free_video_memory: | 996 | free_video_memory: |
997 | s3c2410fb_unmap_video_memory(fbinfo); | 997 | s3c2410fb_unmap_video_memory(fbinfo); |
998 | release_clock: | 998 | release_clock: |
999 | clk_disable(info->clk); | 999 | clk_disable_unprepare(info->clk); |
1000 | clk_put(info->clk); | 1000 | clk_put(info->clk); |
1001 | release_irq: | 1001 | release_irq: |
1002 | free_irq(irq, info); | 1002 | free_irq(irq, info); |
@@ -1038,7 +1038,7 @@ static int s3c2410fb_remove(struct platform_device *pdev) | |||
1038 | s3c2410fb_unmap_video_memory(fbinfo); | 1038 | s3c2410fb_unmap_video_memory(fbinfo); |
1039 | 1039 | ||
1040 | if (info->clk) { | 1040 | if (info->clk) { |
1041 | clk_disable(info->clk); | 1041 | clk_disable_unprepare(info->clk); |
1042 | clk_put(info->clk); | 1042 | clk_put(info->clk); |
1043 | info->clk = NULL; | 1043 | info->clk = NULL; |
1044 | } | 1044 | } |
@@ -1070,7 +1070,7 @@ static int s3c2410fb_suspend(struct platform_device *dev, pm_message_t state) | |||
1070 | * before the clock goes off again (bjd) */ | 1070 | * before the clock goes off again (bjd) */ |
1071 | 1071 | ||
1072 | usleep_range(1000, 1100); | 1072 | usleep_range(1000, 1100); |
1073 | clk_disable(info->clk); | 1073 | clk_disable_unprepare(info->clk); |
1074 | 1074 | ||
1075 | return 0; | 1075 | return 0; |
1076 | } | 1076 | } |
@@ -1080,7 +1080,7 @@ static int s3c2410fb_resume(struct platform_device *dev) | |||
1080 | struct fb_info *fbinfo = platform_get_drvdata(dev); | 1080 | struct fb_info *fbinfo = platform_get_drvdata(dev); |
1081 | struct s3c2410fb_info *info = fbinfo->par; | 1081 | struct s3c2410fb_info *info = fbinfo->par; |
1082 | 1082 | ||
1083 | clk_enable(info->clk); | 1083 | clk_prepare_enable(info->clk); |
1084 | usleep_range(1000, 1100); | 1084 | usleep_range(1000, 1100); |
1085 | 1085 | ||
1086 | s3c2410fb_init_registers(fbinfo); | 1086 | s3c2410fb_init_registers(fbinfo); |