|
@@ -1353,7 +1353,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
|
|
|
return ret;
|
|
|
}
|
|
|
dev_dbg(&pdev->dev, "clock source %p\n", jpeg->clk);
|
|
|
- clk_enable(jpeg->clk);
|
|
|
+ clk_prepare_enable(jpeg->clk);
|
|
|
|
|
|
/* v4l2 device */
|
|
|
ret = v4l2_device_register(&pdev->dev, &jpeg->v4l2_dev);
|
|
@@ -1460,7 +1460,7 @@ device_register_rollback:
|
|
|
v4l2_device_unregister(&jpeg->v4l2_dev);
|
|
|
|
|
|
clk_get_rollback:
|
|
|
- clk_disable(jpeg->clk);
|
|
|
+ clk_disable_unprepare(jpeg->clk);
|
|
|
clk_put(jpeg->clk);
|
|
|
|
|
|
return ret;
|
|
@@ -1480,7 +1480,7 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
|
|
|
v4l2_m2m_release(jpeg->m2m_dev);
|
|
|
v4l2_device_unregister(&jpeg->v4l2_dev);
|
|
|
|
|
|
- clk_disable(jpeg->clk);
|
|
|
+ clk_disable_unprepare(jpeg->clk);
|
|
|
clk_put(jpeg->clk);
|
|
|
|
|
|
return 0;
|