Merge "msm: msm_bus: Always enable/disable bus clock during qos programming" (e6648086) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/msm_bus/msm_bus_fabric_adhoc.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -608,6 +608,7 @@ static int msm_bus_qos_enable_clk(struct msm_bus_node_device_type *node)
		__func__, node->node_info->id);
		goto exit_enable_qos_clk;
		}
		}

		ret = enable_nodeclk(&bus_node->clk[DUAL_CTX]);
		if (ret) {
		@@ -616,7 +617,6 @@ static int msm_bus_qos_enable_clk(struct msm_bus_node_device_type *node)
		goto exit_enable_qos_clk;
		}
		bus_qos_enabled = 1;
		}

		if (!IS_ERR_OR_NULL(node->qos_clk.clk)) {
		rounded_rate = clk_round_rate(node->qos_clk.clk, 1);
		@@ -681,7 +681,7 @@ int msm_bus_enable_limiter(struct msm_bus_node_device_type *node_dev,
		bus_node_dev->fabdev->qos_off,
		bus_node_dev->fabdev->qos_freq,
		enable, lim_bw);
		msm_bus_qos_disable_clk(node_dev, ret);
		ret = msm_bus_qos_disable_clk(node_dev, ret);
		}

		exit_enable_limiter:
		@@ -739,7 +739,7 @@ static int msm_bus_dev_init_qos(struct device dev, void data)
		bus_node_info->fabdev->base_offset,
		bus_node_info->fabdev->qos_off,
		bus_node_info->fabdev->qos_freq);
		msm_bus_qos_disable_clk(node_dev, ret);
		ret = msm_bus_qos_disable_clk(node_dev, ret);
		}
		} else
		MSM_BUS_ERR("%s: Skipping QOS init for %d",