evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: ais: handle the error value returned during get clock" into kernel.lnx.4.4.r35-rel

Browse source
This commit is contained in:
Linux Build Service Account 2019-06-03 11:54:46 -07:00 • committed by Gerrit - the friendly Code Review server
commit 56267aa801
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drivers/media/platform/msm/ais/common/msm_camera_io_util.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved. /* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -357,12 +357,13 @@ int msm_cam_clk_enable(struct device *dev, struct msm_cam_clk_info *clk_info,
} }
} else { } else {
for (i = num_clk - 1; i >= 0; i--) { for (i = num_clk - 1; i >= 0; i--) {
if (clk_ptr[i] != NULL) { if (!IS_ERR_OR_NULL(clk_ptr[i])) {
CDBG("%s disable %s\n", __func__, CDBG("%s disable %s\n", __func__,
clk_info[i].clk_name); clk_info[i].clk_name);
clk_disable(clk_ptr[i]); clk_disable(clk_ptr[i]);
clk_unprepare(clk_ptr[i]); clk_unprepare(clk_ptr[i]);
clk_put(clk_ptr[i]); clk_put(clk_ptr[i]);
clk_ptr[i] = NULL;
} }
} }
} }
@ -378,10 +379,11 @@ cam_clk_set_err:
clk_put(clk_ptr[i]); clk_put(clk_ptr[i]);
cam_clk_get_err: cam_clk_get_err:
for (i--; i >= 0; i--) { for (i--; i >= 0; i--) {
if (clk_ptr[i] != NULL) { if (!IS_ERR_OR_NULL(clk_ptr[i])) {
clk_disable(clk_ptr[i]); clk_disable(clk_ptr[i]);
clk_unprepare(clk_ptr[i]); clk_unprepare(clk_ptr[i]);
clk_put(clk_ptr[i]); clk_put(clk_ptr[i]);
clk_ptr[i] = NULL;
} }
} }
return rc; return rc;