Merge "msm: camera: Allow zero as valid input to enable_clk()" into msm-4.9 (2551dbca) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_utils/cam_soc_util.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ int cam_soc_util_clk_enable(struct clk clk, const char clk_name,
		int rc = 0;
		long clk_rate_round;

		if (!clk \|\| !clk_name \|\| !clk_rate)
		if (!clk \|\| !clk_name)
		return -EINVAL;

		CDBG("enable %s, clk %pK rate %d\n",
		@@ -231,8 +231,8 @@ static int cam_soc_util_get_dt_clk_info(struct cam_hw_soc_info *soc_info)
		return rc;
		}

		rc = of_property_read_string_index(of_node, "src-clock-name",
		i, &src_clk_str);
		rc = of_property_read_string_index(of_node, "src-clock-name", 0,
		&src_clk_str);
		if (rc) {
		CDBG("No src_clk_str found\n");
		soc_info->src_clk_idx = -1;