git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
clockdomain.c
diff --git
a/arch/arm/mach-omap2/clockdomain.c
b/arch/arm/mach-omap2/clockdomain.c
index
1a45ed1
..
dd285f0
100644
(file)
--- a/
arch/arm/mach-omap2/clockdomain.c
+++ b/
arch/arm/mach-omap2/clockdomain.c
@@
-559,7
+559,7
@@
int omap2_clkdm_clk_enable(struct clockdomain *clkdm, struct clk *clk)
* downstream clocks for debugging purposes?
*/
* downstream clocks for debugging purposes?
*/
- if (!clkdm || !clk)
+ if (!clkdm || !clk
|| !clkdm->clktrctrl_mask
)
return -EINVAL;
if (atomic_inc_return(&clkdm->usecount) > 1)
return -EINVAL;
if (atomic_inc_return(&clkdm->usecount) > 1)
@@
-610,7
+610,7
@@
int omap2_clkdm_clk_disable(struct clockdomain *clkdm, struct clk *clk)
* downstream clocks for debugging purposes?
*/
* downstream clocks for debugging purposes?
*/
- if (!clkdm || !clk)
+ if (!clkdm || !clk
|| !clkdm->clktrctrl_mask
)
return -EINVAL;
#ifdef DEBUG
return -EINVAL;
#ifdef DEBUG