Patch "clk: xgene: Add missing parenthesis when clearing divider value" has been added to the 4.5-stable tree
From: <gregkh@linuxfoundation.org>
Date: 2016-05-06 17:44:05
This is a note to let you know that I've just added the patch titled
clk: xgene: Add missing parenthesis when clearing divider value
to the 4.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-xgene-add-missing-parenthesis-when-clearing-divider-value.patch
and it can be found in the queue-4.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let [off-list ref] know about it.
From 0f4c7a138dfefb0ebdbaf56e3ba2acd2958a6605 Mon Sep 17 00:00:00 2001
From: Loc Ho <redacted>
Date: Mon, 29 Feb 2016 14:15:43 -0700
Subject: clk: xgene: Add missing parenthesis when clearing divider value
From: Loc Ho <redacted>
commit 0f4c7a138dfefb0ebdbaf56e3ba2acd2958a6605 upstream.
In the initial fix for non-zero divider shift value, the parenthesis
was missing after the negate operation. This patch adds the required
parenthesis. Otherwise, lower bits may be cleared unintentionally.
Signed-off-by: Loc Ho <redacted>
Acked-by: Toan Le <redacted>
Fixes: 1382ea631ddd ("clk: xgene: Fix divider with non-zero shift value")
Signed-off-by: Stephen Boyd <redacted>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/clk/clk-xgene.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/clk/clk-xgene.c
+++ b/drivers/clk/clk-xgene.c@@ -351,8 +351,8 @@ static int xgene_clk_set_rate(struct clk /* Set new divider */ data = xgene_clk_read(pclk->param.divider_reg + pclk->param.reg_divider_offset); - data &= ~((1 << pclk->param.reg_divider_width) - 1) - << pclk->param.reg_divider_shift; + data &= ~(((1 << pclk->param.reg_divider_width) - 1) + << pclk->param.reg_divider_shift); data |= divider; xgene_clk_write(data, pclk->param.divider_reg + pclk->param.reg_divider_offset);
Patches currently in stable-queue which might be from lho@apm.com are queue-4.5/clk-xgene-add-missing-parenthesis-when-clearing-divider-value.patch