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

Commit e8bf8df9 authored by Russell King's avatar Russell King
Browse files

CLKDEV: Fix clkdev return value for NULL clk case 



clkdev may incorrectly cause a clkdev entry with a NULL clk to return
-ENOENT.  This is not the intention of this code; -ENOENT should only
be returned if the clock entry can not be found in the table.  Fix
this.

Reported-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0f22072a

drivers/clk/clkdev.c

+9 −10
Original line number Diff line number Diff line
@@ -32,10 +32,9 @@ static DEFINE_MUTEX(clocks_mutex); 
 * Then we take the most specific entry - with the following

 * order of precedence: dev+con > dev only > con only.

 */

static struct clk *clk_find(const char *dev_id, const char *con_id)

static struct clk_lookup *clk_find(const char *dev_id, const char *con_id)

{

	struct clk_lookup *p;

	struct clk *clk = NULL;

	struct clk_lookup *p, *cl = NULL;

	int match, best = 0;



	list_for_each_entry(p, &clocks, node) {
@@ -52,27 +51,27 @@ static struct clk *clk_find(const char *dev_id, const char *con_id) 
		}



		if (match > best) {

			clk = p->clk;

			cl = p;

			if (match != 3)

				best = match;

			else

				break;

		}

	}

	return clk;

	return cl;

}



struct clk *clk_get_sys(const char *dev_id, const char *con_id)

{

	struct clk *clk;

	struct clk_lookup *cl;



	mutex_lock(&clocks_mutex);

	clk = clk_find(dev_id, con_id);

	if (clk && !__clk_get(clk))

		clk = NULL;

	cl = clk_find(dev_id, con_id);

	if (cl && !__clk_get(cl->clk))

		cl = NULL;

	mutex_unlock(&clocks_mutex);



	return clk ? clk : ERR_PTR(-ENOENT);

	return cl ? cl->clk : ERR_PTR(-ENOENT);

}

EXPORT_SYMBOL(clk_get_sys);