From 2b8e8553b04baaa7c161abd535f86d2578aa1404 Mon Sep 17 00:00:00 2001 From: Thomas Abraham Date: Tue, 2 Oct 2012 20:55:02 -0300 Subject: [PATCH] --- yaml --- r: 333753 b: refs/heads/master c: 2c4c03f3819dc6c0e294d47558ed8c07cd3fb15e h: refs/heads/master i: 333751: 256bba5cba5755b60440f547561a721cbd364e0e v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5753b4dfd07d..502e4e6b6ba0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1309b33683addabe4700e0bcce422de70f6dc4c8 +refs/heads/master: 2c4c03f3819dc6c0e294d47558ed8c07cd3fb15e diff --git a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c index 394775ae5774..17983c4c9a9a 100644 --- a/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c +++ b/trunk/drivers/media/platform/s5p-jpeg/jpeg-core.c @@ -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 @@ static int s5p_jpeg_probe(struct platform_device *pdev) 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;