diff options
| author | Sakari Ailus <sakari.ailus@linux.intel.com> | 2018-05-09 16:24:35 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2018-05-17 06:22:08 -0400 |
| commit | 28d42d2fcaad68fa81a328adfb027323796e5f6e (patch) | |
| tree | 09aaf3ea0df607b073cdd6b74b8b93ea408f61f0 /drivers/media/platform/cadence/cdns-csi2rx.c | |
| parent | 844ef042491d2824d5ed8dc5f75b5f539487f82c (diff) | |
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 <mchehab@kernel.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Diffstat (limited to 'drivers/media/platform/cadence/cdns-csi2rx.c')
| -rw-r--r-- | drivers/media/platform/cadence/cdns-csi2rx.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |