]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
clk: mvebu: armada-37xx-periph: Fix wrong return value in get_parent
authorGregory CLEMENT <gregory.clement@bootlin.com>
Fri, 13 Jul 2018 10:27:26 +0000 (12:27 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 26 Sep 2018 06:39:22 +0000 (08:39 +0200)
[ Upstream commit 616bf80d381da13fbb392ebff06f46f946e3ee84 ]

The return value of the get_parent operation is a u8, whereas a -EINVAL
was returned. This wrong value was return if the value was bigger that
the number of parent but this case was already handled by the core.

So we can just remove this chunk of code to fix the issue.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: 9818a7a4fd10 ("clk: mvebu: armada-37xx-periph: prepare cpu clk to
be used with DVFS")
Signed-off-by: Gregory CLEMENT <gregory.clement@bootlin.com>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/clk/mvebu/armada-37xx-periph.c

index 44e4e27eddada1dd96a3a3d9ae414bd711a89d4d..6f7637b197384d446976f1a77d85c7834805246b 100644 (file)
@@ -429,9 +429,6 @@ static u8 clk_pm_cpu_get_parent(struct clk_hw *hw)
                val &= pm_cpu->mask_mux;
        }
 
-       if (val >= num_parents)
-               return -EINVAL;
-
        return val;
 }