shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

camera: rk_cam_cif: v0.3.0x11

Browse Source
This commit is contained in:
ddl
2013-08-22 16:52:12 +08:00
parent c0efc047a7
commit f997ee6df4
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/media/video/rk30_camera_oneframe.c
View File

@@ -326,6 +326,7 @@ module_param(debug, int, S_IRUGO|S_IWUSR);
*v0.3.0x11:
* 1. fix vb struct may be used again which have been free after stream off, some code modify in soc_camera.c,
* version is v0.1.1;
* 1. fix cif clk out can't be turn off;
*
*/
@@ -1596,14 +1597,20 @@ static int rk_camera_mclk_ctrl(int cif_idx, int on, int clk_rate)
clk->on = false;
if(cif){
cif_clk_out_div = clk_get(NULL, "cif1_out_div");
err = clk_set_parent(clk->cif_clk_out,cif_clk_out_div);
}else{
cif_clk_out_div = clk_get(NULL, "cif0_out_div");
if(IS_ERR_OR_NULL(cif_clk_out_div)){
if(IS_ERR_OR_NULL(cif_clk_out_div)) {
cif_clk_out_div = clk_get(NULL, "cif_out_div");
}
err = clk_set_parent(clk->cif_clk_out, cif_clk_out_div);
}
if(IS_ERR_OR_NULL(cif_clk_out_div)) {
err = clk_set_parent(clk->cif_clk_out, cif_clk_out_div);
clk_put(cif_clk_out_div);
} else {
err = -1;
}
if(err)
RKCAMERA_TR("WARNING %s_%s_%d: camera sensor mclk maybe not close, please check!!!\n", __FILE__, __FUNCTION__, __LINE__);
}