Merge branch 'v4l_for_linus' into staging/for_v3.4

* v4l_for_linus:
  [media] V4L: atmel-isi: add clk_prepare()/clk_unprepare() functions

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/media/video/atmel-isi.c b/drivers/media/video/atmel-isi.c
index 9fe4519176a4..ec3f6a06f9c3 100644
--- a/drivers/media/video/atmel-isi.c
+++ b/drivers/media/video/atmel-isi.c
@@ -922,7 +922,9 @@ static int __devexit atmel_isi_remove(struct platform_device *pdev)
                         isi->fb_descriptors_phys);
 
         iounmap(isi->regs);
+        clk_unprepare(isi->mck);
         clk_put(isi->mck);
+        clk_unprepare(isi->pclk);
         clk_put(isi->pclk);
         kfree(isi);
 
@@ -955,6 +957,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
         if (IS_ERR(pclk))
                 return PTR_ERR(pclk);
 
+        ret = clk_prepare(pclk);
+        if (ret)
+                goto err_clk_prepare_pclk;
+
         isi = kzalloc(sizeof(struct atmel_isi), GFP_KERNEL);
         if (!isi) {
                 ret = -ENOMEM;
@@ -978,6 +984,10 @@ static int __devinit atmel_isi_probe(struct platform_device *pdev)
                 goto err_clk_get;
         }
 
+        ret = clk_prepare(isi->mck);
+        if (ret)
+                goto err_clk_prepare_mck;
+
         /* Set ISI_MCK's frequency, it should be faster than pixel clock */
         ret = clk_set_rate(isi->mck, pdata->mck_hz);
         if (ret < 0)
@@ -1059,10 +1069,14 @@ err_alloc_ctx:
                         isi->fb_descriptors_phys);
 err_alloc_descriptors:
 err_set_mck_rate:
+        clk_unprepare(isi->mck);
+err_clk_prepare_mck:
         clk_put(isi->mck);
 err_clk_get:
         kfree(isi);
 err_alloc_isi:
+        clk_unprepare(pclk);
+err_clk_prepare_pclk:
         clk_put(pclk);
 
         return ret;