Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7235b8b authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'v3.6-samsung-fixes-3' of... 

Merge branch 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes

* 'v3.6-samsung-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: SAMSUNG: Use spin_lock_{irqsave,irqrestore} in clk_set_rate
  ARM: SAMSUNG: use spin_lock_irqsave() in clk_set_parent
parents 5698bd75 d6838a62

arch/arm/plat-samsung/clock.c

+6 −4
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ long clk_round_rate(struct clk *clk, unsigned long rate) 


int clk_set_rate(struct clk *clk, unsigned long rate)

{

	unsigned long flags;

	int ret;



	if (IS_ERR(clk))
@@ -159,9 +160,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) 
	if (clk->ops == NULL || clk->ops->set_rate == NULL)

		return -EINVAL;



	spin_lock(&clocks_lock);

	spin_lock_irqsave(&clocks_lock, flags);

	ret = (clk->ops->set_rate)(clk, rate);

	spin_unlock(&clocks_lock);

	spin_unlock_irqrestore(&clocks_lock, flags);



	return ret;

}
@@ -173,17 +174,18 @@ struct clk *clk_get_parent(struct clk *clk) 


int clk_set_parent(struct clk *clk, struct clk *parent)

{

	unsigned long flags;

	int ret = 0;



	if (IS_ERR(clk))

		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);



	spin_unlock(&clocks_lock);

	spin_unlock_irqrestore(&clocks_lock, flags);



	return ret;

}