Merge "clk: qcom: clock-generic: Don't assume parent rate" (747a2c9a) · Commits · e / devices / android_kernel_sony_msm8994

drivers/clk/qcom/clock-generic.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -104,15 +104,13 @@ static int mux_set_rate(struct clk *c, unsigned long rate)
		* rate.
		*/
		for (i = 0; i < mux->num_parents && mux->try_get_rate; i++) {
		if (mux->parents[i].src->rate == rate) {
		struct clk *p = mux->parents[i].src;
		if (p->rate == rate && clk_round_rate(p, rate) == rate) {
		new_parent = mux->parents[i].src;
		break;
		}
		}

		if (new_parent == c->parent && rate == c->rate)
		return 0;

		for (i = 0; i < mux->num_parents && !(!i && new_parent); i++) {
		if (clk_round_rate(mux->parents[i].src, rate) == rate) {
		new_parent = mux->parents[i].src;