Skip to content

Commit

Permalink
[media] exynos-gsc: Correct the clock handling
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sylwester Nawrocki authored and Mauro Carvalho Chehab committed Dec 21, 2012
1 parent 9318ab6 commit 21ae96d
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions drivers/media/platform/exynos-gsc/gsc-core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1002,12 +1002,11 @@ static void *gsc_get_drv_data(struct platform_device *pdev)

static void gsc_clk_put(struct gsc_dev *gsc)
{
if (IS_ERR_OR_NULL(gsc->clock))
return;

clk_unprepare(gsc->clock);
clk_put(gsc->clock);
gsc->clock = NULL;
if (!IS_ERR(gsc->clock)) {
clk_unprepare(gsc->clock);
clk_put(gsc->clock);
gsc->clock = NULL;
}
}

static int gsc_clk_get(struct gsc_dev *gsc)
Expand All @@ -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",
GSC_CLOCK_GATE_NAME);
clk_put(gsc->clock);
gsc->clock = NULL;
gsc->clock = ERR_PTR(-EINVAL);
goto err_clk_prepare;
}

Expand Down Expand Up @@ -1106,6 +1105,7 @@ static int gsc_probe(struct platform_device *pdev)
init_waitqueue_head(&gsc->irq_queue);
spin_lock_init(&gsc->slock);
mutex_init(&gsc->lock);
gsc->clock = ERR_PTR(-EINVAL);

res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
gsc->regs = devm_request_and_ioremap(dev, res);
Expand Down Expand Up @@ -1169,6 +1169,7 @@ static int __devexit gsc_remove(struct platform_device *pdev)

vb2_dma_contig_cleanup_ctx(gsc->alloc_ctx);
pm_runtime_disable(&pdev->dev);
gsc_clk_put(gsc);

dev_dbg(&pdev->dev, "%s driver unloaded\n", pdev->name);
return 0;
Expand Down

0 comments on commit 21ae96d

Please sign in to comment.