hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] exynos-gsc: Correct the clock handling 

Make sure there is no unbalanced clk_unprepare call and add missing
clock release in the driver's remove() callback.

Signed-off-by: Sylwester Nawrocki <sylvester.nawrocki@gmail.com>
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Sylwester Nawrocki <s.nawrocki@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Sylwester Nawrocki 2012-11-26 03:20:20 -03:00 committed by Mauro Carvalho Chehab
parent 9318ab69c5
commit 21ae96d397
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/platform/exynos-gsc/gsc-core.c
View File

@ -1002,12 +1002,11 @@ static void *gsc_get_drv_data(struct platform_device *pdev)
static void gsc_clk_put(struct gsc_dev *gsc) static void gsc_clk_put(struct gsc_dev *gsc)
{ {
if (IS_ERR_OR_NULL(gsc->clock)) if (!IS_ERR(gsc->clock)) {
return; clk_unprepare(gsc->clock);
clk_put(gsc->clock);
clk_unprepare(gsc->clock); gsc->clock = NULL;
clk_put(gsc->clock); }
gsc->clock = NULL;
} }
static int gsc_clk_get(struct gsc_dev *gsc) static int gsc_clk_get(struct gsc_dev *gsc)
@ -1028,7 +1027,7 @@ static int gsc_clk_get(struct gsc_dev *gsc)
dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n", dev_err(&gsc->pdev->dev, "clock prepare failed for clock: %s\n",
GSC_CLOCK_GATE_NAME); GSC_CLOCK_GATE_NAME);
clk_put(gsc->clock); clk_put(gsc->clock);
gsc->clock = NULL; gsc->clock = ERR_PTR(-EINVAL);
goto err_clk_prepare; goto err_clk_prepare;
} }
@ -1106,6 +1105,7 @@ static int gsc_probe(struct platform_device *pdev)
init_waitqueue_head(&gsc->irq_queue); init_waitqueue_head(&gsc->irq_queue);
spin_lock_init(&gsc->slock); spin_lock_init(&gsc->slock);
mutex_init(&gsc->lock); mutex_init(&gsc->lock);
gsc->clock = ERR_PTR(-EINVAL);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gsc->regs = devm_request_and_ioremap(dev, res); gsc->regs = devm_request_and_ioremap(dev, res);
@ -1169,6 +1169,7 @@ static int __devexit gsc_remove(struct platform_device *pdev)
vb2_dma_contig_cleanup_ctx(gsc->alloc_ctx); vb2_dma_contig_cleanup_ctx(gsc->alloc_ctx);
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
gsc_clk_put(gsc);
dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name); dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
return 0; return 0;