Merge "ais: always do clock set_rate after get_rate"

This commit is contained in:
Linux Build Service Account 2017-05-30 16:04:33 -07:00 committed by Gerrit - the friendly Code Review server
commit 6cec3ff5eb

View file

@ -379,13 +379,13 @@ int msm_camera_clk_enable(struct device *dev,
clk_info[i].clk_name); clk_info[i].clk_name);
goto cam_clk_set_err; goto cam_clk_set_err;
} }
rc = clk_set_rate(clk_ptr[i], }
clk_rate); rc = clk_set_rate(clk_ptr[i],
if (rc < 0) { clk_rate);
pr_err("%s set rate failed\n", if (rc < 0) {
clk_info[i].clk_name); pr_err("%s set rate failed\n",
goto cam_clk_set_err; clk_info[i].clk_name);
} goto cam_clk_set_err;
} }
} }
rc = clk_prepare_enable(clk_ptr[i]); rc = clk_prepare_enable(clk_ptr[i]);