Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit db700a51 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Fix for enabling front camera"

parents 4eadb93b 83c8cac7

drivers/media/platform/msm/camera_v2/sensor/csid/msm_csid.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int msm_csid_config(struct csid_device *csid_dev, 
	if (!msm_csid_find_max_clk_rate(csid_dev))

		pr_err("msm_csid_find_max_clk_rate failed\n");



	clk_rate = (csid_params->csi_clk > 0) ?

	clk_rate = ((int)csid_params->csi_clk > 0) ?

				(csid_params->csi_clk) : csid_dev->csid_max_clk;



	clk_rate = msm_camera_clk_set_rate(&csid_dev->pdev->dev,

drivers/media/platform/msm/camera_v2/sensor/csiphy/msm_csiphy.c

+1 −1
Original line number Diff line number Diff line
@@ -483,7 +483,7 @@ static int msm_csiphy_lane_config(struct csiphy_device *csiphy_dev, 
		return rc;

	}



	clk_rate = (csiphy_params->csiphy_clk > 0)

	clk_rate = ((int)csiphy_params->csiphy_clk > 0)

			? csiphy_params->csiphy_clk :

			csiphy_dev->csiphy_max_clk;

	clk_rate = msm_camera_clk_set_rate(&csiphy_dev->pdev->dev,