From: Sakari Ailus Date: Wed, 9 May 2018 20:24:35 +0000 (-0400) Subject: media: cadence: csi2rx: Fix csi2rx_start error handling X-Git-Tag: android-x86-8.1-r1~932^2~108 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=28d42d2fcaad68fa81a328adfb027323796e5f6e;p=android-x86%2Fkernel.git media: cadence: csi2rx: Fix csi2rx_start error handling The clocks enabled by csi2rx_start function are intended to be disabled in an error path but there are two issues: 1) the loop condition is always true and 2) the first clock disabled is the the one enabling of which failed. Fix these two bugs by changing the loop condition as well as only disabling the clocks that were actually enabled. Reported-by: Mauro Chehab Signed-off-by: Sakari Ailus Acked-by: Maxime Ripard Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c index fe612ec1f99f..a0f02916006b 100644 --- a/drivers/media/platform/cadence/cdns-csi2rx.c +++ b/drivers/media/platform/cadence/cdns-csi2rx.c @@ -174,8 +174,8 @@ static int csi2rx_start(struct csi2rx_priv *csi2rx) return 0; err_disable_pixclk: - for (; i >= 0; i--) - clk_disable_unprepare(csi2rx->pixel_clk[i]); + for (; i > 0; i--) + clk_disable_unprepare(csi2rx->pixel_clk[i - 1]); err_disable_pclk: clk_disable_unprepare(csi2rx->p_clk);