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

Commit 67eb890e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 

Pull AVR32 fix from Hans-Christian Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: handle NULL as a valid clock object
parents 02ff371a 5c02a420

arch/avr32/mach-at32ap/clock.c

+19 −1
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ int clk_enable(struct clk *clk) 
{

	unsigned long flags;



	if (!clk)

		return 0;



	spin_lock_irqsave(&clk_lock, flags);

	__clk_enable(clk);

	spin_unlock_irqrestore(&clk_lock, flags);
@@ -106,6 +109,9 @@ void clk_disable(struct clk *clk) 
{

	unsigned long flags;



	if (IS_ERR_OR_NULL(clk))

		return;



	spin_lock_irqsave(&clk_lock, flags);

	__clk_disable(clk);

	spin_unlock_irqrestore(&clk_lock, flags);
@@ -117,6 +123,9 @@ unsigned long clk_get_rate(struct clk *clk) 
	unsigned long flags;

	unsigned long rate;



	if (!clk)

		return 0;



	spin_lock_irqsave(&clk_lock, flags);

	rate = clk->get_rate(clk);

	spin_unlock_irqrestore(&clk_lock, flags);
@@ -129,6 +138,9 @@ long clk_round_rate(struct clk *clk, unsigned long rate) 
{

	unsigned long flags, actual_rate;



	if (!clk)

		return 0;



	if (!clk->set_rate)

		return -ENOSYS;
@@ -145,6 +157,9 @@ int clk_set_rate(struct clk *clk, unsigned long rate) 
	unsigned long flags;

	long ret;



	if (!clk)

		return 0;



	if (!clk->set_rate)

		return -ENOSYS;
@@ -161,6 +176,9 @@ int clk_set_parent(struct clk *clk, struct clk *parent) 
	unsigned long flags;

	int ret;



	if (!clk)

		return 0;



	if (!clk->set_parent)

		return -ENOSYS;
@@ -174,7 +192,7 @@ EXPORT_SYMBOL(clk_set_parent); 


struct clk *clk_get_parent(struct clk *clk)

{

	return clk->parent;

	return !clk ? NULL : clk->parent;

}

EXPORT_SYMBOL(clk_get_parent);