media mx3 camera: prepare clk before enabling it (fdf7748b) · Commits · e / devices / android_kernel_teracube_2e

drivers/media/video/mx3_camera.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -508,7 +508,7 @@ static void mx3_camera_activate(struct mx3_camera_dev *mx3_cam,
	/* ipu_csi_init_interface() */		/* ipu_csi_init_interface() */
	csi_reg_write(mx3_cam, conf, CSI_SENS_CONF);		csi_reg_write(mx3_cam, conf, CSI_SENS_CONF);

	clk_enable(mx3_cam->clk);		clk_prepare_enable(mx3_cam->clk);
	rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);		rate = clk_round_rate(mx3_cam->clk, mx3_cam->mclk);
	dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate);		dev_dbg(icd->parent, "Set SENS_CONF to %x, rate %ld\n", conf, rate);
	if (rate)		if (rate)
	@@ -549,7 +549,7 @@ static void mx3_camera_remove_device(struct soc_camera_device *icd)
	*ichan = NULL;		*ichan = NULL;
	}		}

	clk_disable(mx3_cam->clk);		clk_disable_unprepare(mx3_cam->clk);

	mx3_cam->icd = NULL;		mx3_cam->icd = NULL;