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

Commit 082ea2ef authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge branch 'clk-fixes' into clk-next 

* clk-fixes:
  clk: fix a panic error caused by accessing NULL pointer
  clk: Manage proper runtime PM state in clk_change_rate()
parents 4fbd8d19 975b820b

drivers/clk/clk.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -1564,6 +1564,9 @@ static void clk_change_rate(struct clk_core *core) 
		best_parent_rate = core->parent->rate;

		best_parent_rate = core->parent->rate;

	}

	}





	if (clk_pm_runtime_get(core))

		return;



	if (core->flags & CLK_SET_RATE_UNGATE) {

	if (core->flags & CLK_SET_RATE_UNGATE) {

		unsigned long flags;

		unsigned long flags;
@@ -1634,6 +1637,8 @@ static void clk_change_rate(struct clk_core *core) 
	/* handle the new child who might not be in core->children yet */

	/* handle the new child who might not be in core->children yet */

	if (core->new_child)

	if (core->new_child)

		clk_change_rate(core->new_child);

		clk_change_rate(core->new_child);



	clk_pm_runtime_put(core);

}

}





static int clk_core_set_rate_nolock(struct clk_core *core,

static int clk_core_set_rate_nolock(struct clk_core *core,

include/trace/events/clk.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -134,12 +134,12 @@ DECLARE_EVENT_CLASS(clk_parent, 




	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__string(        name,           core->name                )

		__string(        name,           core->name                )

		__string(        pname,          parent->name              )

		__string(        pname, parent ? parent->name : "none"     )

	),

	),





	TP_fast_assign(

	TP_fast_assign(

		__assign_str(name, core->name);

		__assign_str(name, core->name);

		__assign_str(pname, parent->name);

		__assign_str(pname, parent ? parent->name : "none");

	),

	),





	TP_printk("%s %s", __get_str(name), __get_str(pname))

	TP_printk("%s %s", __get_str(name), __get_str(pname))