From: Kukjin Kim <kgene.kim@samsung.com>
Date: Fri, 21 Sep 2012 02:27:45 +0000 (+0900)
Subject: Merge branch 'next/devel-samsung' into for-next
X-Git-Tag: next-20120924~13^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1046745f8fa910fbc6bc8d2d39fc7848278593fa;p=karo-tx-linux.git

Merge branch 'next/devel-samsung' into for-next
---

1046745f8fa910fbc6bc8d2d39fc7848278593fa
diff --cc arch/arm/plat-samsung/clock.c
index d1116e2dfbea,7938fbce825e..012bbd0b8d81
--- a/arch/arm/plat-samsung/clock.c
+++ b/arch/arm/plat-samsung/clock.c
@@@ -144,10 -144,9 +144,10 @@@ long clk_round_rate(struct clk *clk, un
  
  int clk_set_rate(struct clk *clk, unsigned long rate)
  {
 +	unsigned long flags;
  	int ret;
  
- 	if (IS_ERR(clk))
+ 	if (IS_ERR_OR_NULL(clk))
  		return -EINVAL;
  
  	/* We do not default just do a clk->rate = rate as
@@@ -174,13 -173,12 +174,13 @@@ struct clk *clk_get_parent(struct clk *
  
  int clk_set_parent(struct clk *clk, struct clk *parent)
  {
 +	unsigned long flags;
  	int ret = 0;
  
- 	if (IS_ERR(clk))
+ 	if (IS_ERR_OR_NULL(clk) || IS_ERR_OR_NULL(parent))
  		return -EINVAL;
  
 -	spin_lock(&clocks_lock);
 +	spin_lock_irqsave(&clocks_lock, flags);
  
  	if (clk->ops && clk->ops->set_parent)
  		ret = (clk->ops->set_parent)(clk, parent);