Merge "clk: msm: clock-local2: Fix get_rate ops for branch clock"

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

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

 *

 *

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

 * 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

 * it under the terms of the GNU General Public License version 2 and

{

{

	struct branch_clk *branch = to_branch_clk(c);

	struct branch_clk *branch = to_branch_clk(c);

	if (branch->max_div)

	if (branch->max_div ||

			(branch->aggr_sibling_rates && !branch->is_prepared))

		return branch->c.rate;

		return branch->c.rate;

	return clk_get_rate(c->parent);

	return clk_get_rate(c->parent);