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

Commit 08dee26f 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 TCXO shutdown"

parents 6342eddf cbb2d68f

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+1 −1
Original line number Diff line number Diff line
@@ -218,7 +218,7 @@ static int msm_ispif_clk_ahb_enable(struct ispif_device *ispif, int enable) 
	}



	rc = msm_cam_clk_enable(&ispif->pdev->dev,

		ispif_8974_ahb_clk_info, &ispif->ahb_clk,

		ispif_8974_ahb_clk_info, ispif->ahb_clk,

		ispif->num_clk, enable);

	if (rc < 0) {

		pr_err("%s: cannot enable clock, error = %d",

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.h

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct ispif_device { 
	struct ispif_intf_cmd applied_intf_cmd[VFE_MAX];

	enum msm_ispif_state_t ispif_state;

	struct msm_ispif_vfe_info vfe_info;

	struct clk *ahb_clk;

	struct clk *ahb_clk[ISPIF_CLK_INFO_MAX];

	struct completion reset_complete[VFE_MAX];

	uint32_t hw_num_isps;

	uint32_t num_clk;