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

Commit b682a644 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: qcom: clock-pll: Remove no_prepared_reconfig optimization check"

parents 0938d06b 787fd660

drivers/clk/qcom/clock-pll.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2015, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -509,7 +509,7 @@ static long variable_rate_pll_round_rate(struct clk *c, unsigned long rate) 
	if (!pll->src_rate)

		return 0;



	if (pll->no_prepared_reconfig && c->prepare_count && c->rate != rate)

	if (pll->no_prepared_reconfig && c->prepare_count)

		return -EINVAL;



	if (rate < pll->min_rate)