diff --git a/[refs] b/[refs] index fdcb60a1985e..b8068eb7bb24 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6435102d4ca3b5655c0105abe924abec17ffeb8 +refs/heads/master: 00e825c6b99b39f12751ea45d38bb4d900de70f4 diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c index 717056b3d400..7b17137536d6 100644 --- a/trunk/arch/sh/kernel/cpu/clock.c +++ b/trunk/arch/sh/kernel/cpu/clock.c @@ -153,7 +153,7 @@ void clk_disable(struct clk *clk) unsigned long flags; if (!clk) - return -EINVAL; + return; spin_lock_irqsave(&clock_lock, flags); __clk_disable(clk);