diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2012-05-08 10:32:30 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-06-08 10:31:42 +0200 |
| commit | a383fe69e69dcdec8b90337e894220255d2c64b5 (patch) | |
| tree | 2f5f0dd662d559ad6a32bcacc4a2761959f380b2 | |
| parent | 778dbc83e62c1a932f5a609f8aad04071dc7f9d4 (diff) | |
| download | gst-plugins-fsl-vpu-a383fe69e69dcdec8b90337e894220255d2c64b5.tar.gz gst-plugins-fsl-vpu-a383fe69e69dcdec8b90337e894220255d2c64b5.tar.xz | |
...needed for recent kernels.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | module/imx-vpu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/module/imx-vpu.c b/module/imx-vpu.c index 68dbd47..b09a241 100644 --- a/module/imx-vpu.c +++ b/module/imx-vpu.c @@ -2136,7 +2136,7 @@ static int vpu_dev_probe(struct platform_device *pdev) goto err_out_clk; } - clk_enable(vpu->clk); + clk_prepare_enable(vpu->clk); spin_lock_init(&vpu->lock); INIT_LIST_HEAD(&vpu->queued); @@ -2192,7 +2192,7 @@ err_out_irq: err_alloc_ctx: iounmap(vpu->base); err_out_ioremap: - clk_disable(vpu->clk); + clk_disable_unprepare(vpu->clk); clk_put(vpu->clk); err_out_clk: destroy_workqueue(vpu->workqueue); @@ -2217,7 +2217,7 @@ static int vpu_dev_remove(struct platform_device *pdev) free_irq(vpu->irq, vpu); - clk_disable(vpu->clk); + clk_disable_unprepare(vpu->clk); clk_put(vpu->clk); iounmap(vpu->base); |