From 6a4fed27eebed2b8f7f3be5507bef9e231d2eb18 Mon Sep 17 00:00:00 2001 From: Sylwester Nawrocki Date: Fri, 18 Jan 2013 13:52:38 -0300 Subject: [PATCH] --- yaml --- r: 357506 b: refs/heads/master c: 8cd5d42ac6d75143ab4bf44a15f76245a7f6c884 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/platform/s5p-fimc/mipi-csis.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f630c3589243..f716f496666f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 05c79d0d1d0d44c2195d63d1e7c62e358eadeadf +refs/heads/master: 8cd5d42ac6d75143ab4bf44a15f76245a7f6c884 diff --git a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c index 1cc6501c213f..981863d05aaa 100644 --- a/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c +++ b/trunk/drivers/media/platform/s5p-fimc/mipi-csis.c @@ -771,7 +771,7 @@ static int s5pcsis_probe(struct platform_device *pdev) 0, dev_name(&pdev->dev), state); if (ret) { dev_err(&pdev->dev, "Interrupt request failed\n"); - goto e_clkput; + goto e_clkdis; } v4l2_subdev_init(&state->sd, &s5pcsis_subdev_ops); @@ -789,7 +789,7 @@ static int s5pcsis_probe(struct platform_device *pdev) ret = media_entity_init(&state->sd.entity, CSIS_PADS_NUM, state->pads, 0); if (ret < 0) - goto e_clkput; + goto e_clkdis; /* This allows to retrieve the platform device id by the host driver */ v4l2_set_subdevdata(&state->sd, pdev); @@ -802,8 +802,9 @@ static int s5pcsis_probe(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); return 0; -e_clkput: +e_clkdis: clk_disable(state->clock[CSIS_CLK_MUX]); +e_clkput: s5pcsis_clk_put(state); return ret; }