From 4901bca59d29dbbb805e30e15c32b4060ef5b006 Mon Sep 17 00:00:00 2001 From: Wolfram Sang Date: Sat, 10 Sep 2011 12:29:43 +0200 Subject: [PATCH] --- yaml --- r: 295814 b: refs/heads/master c: a62407256bbcba8e3f62695a87534050ceec0e6f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-mxs/clock-mx28.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2db28bc1ef40..43a85a43f974 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfc0b9c8a9d546eb53a3491c893fad72d96540cb +refs/heads/master: a62407256bbcba8e3f62695a87534050ceec0e6f diff --git a/trunk/arch/arm/mach-mxs/clock-mx28.c b/trunk/arch/arm/mach-mxs/clock-mx28.c index f71d01282dcd..54d82a4b4cf0 100644 --- a/trunk/arch/arm/mach-mxs/clock-mx28.c +++ b/trunk/arch/arm/mach-mxs/clock-mx28.c @@ -477,6 +477,10 @@ static int name##_set_rate(struct clk *clk, unsigned long rate) \ reg = __raw_readl(CLKCTRL_BASE_ADDR + HW_CLKCTRL_##rs); \ reg &= ~BM_CLKCTRL_##rs##_DIV; \ reg |= div << BP_CLKCTRL_##rs##_DIV; \ + if (reg & (1 << clk->enable_shift)) { \ + pr_err("%s: clock is gated\n", __func__); \ + return -EINVAL; \ + } \ __raw_writel(reg, CLKCTRL_BASE_ADDR + HW_CLKCTRL_##rs); \ \ for (i = 10000; i; i--) \