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

Merge "msm: sensor: fixing errors due to csiphy clock release"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-19 00:44:38 -08:00 • committed by Gerrit - the friendly Code Review server
commit 98c2870e09
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c
View file

@ -1600,7 +1600,7 @@ static const struct v4l2_subdev_ops msm_csiphy_subdev_ops = {
static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev, static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
struct platform_device *pdev) struct platform_device *pdev)
{ {
int i, rc; int i, rc = 0;
char *csi_3p_clk_name = "csi_phy_3p_clk"; char *csi_3p_clk_name = "csi_phy_3p_clk";
char *csi_3p_clk_src_name = "csiphy_3p_clk_src"; char *csi_3p_clk_src_name = "csiphy_3p_clk_src";
uint32_t clk_cnt = 0; uint32_t clk_cnt = 0;
@ -1616,6 +1616,7 @@ static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
if (csiphy_dev->num_all_clk > CSIPHY_NUM_CLK_MAX) { if (csiphy_dev->num_all_clk > CSIPHY_NUM_CLK_MAX) {
pr_err("%s: invalid count=%zu, max is %d\n", __func__, pr_err("%s: invalid count=%zu, max is %d\n", __func__,
csiphy_dev->num_all_clk, CSIPHY_NUM_CLK_MAX); csiphy_dev->num_all_clk, CSIPHY_NUM_CLK_MAX);
rc = -EINVAL;
goto MAX_CLK_ERROR; goto MAX_CLK_ERROR;
} }
@ -1659,13 +1660,14 @@ static int msm_csiphy_get_clk_info(struct csiphy_device *csiphy_dev,
} }
csiphy_dev->num_clk = clk_cnt; csiphy_dev->num_clk = clk_cnt;
return rc;
MAX_CLK_ERROR: MAX_CLK_ERROR:
msm_camera_put_clk_info(csiphy_dev->pdev, msm_camera_put_clk_info(csiphy_dev->pdev,
&csiphy_dev->csiphy_all_clk_info, &csiphy_dev->csiphy_all_clk_info,
&csiphy_dev->csiphy_all_clk, &csiphy_dev->csiphy_all_clk,
csiphy_dev->num_all_clk); csiphy_dev->num_all_clk);
return 0; return rc;
} }
static int csiphy_probe(struct platform_device *pdev) static int csiphy_probe(struct platform_device *pdev)