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

Commit b18ed664 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fixes from Stephen Boyd:
 "Two small fixes, one for the x86 Stoney SoC to get a more accurate clk
  frequency and the other to fix a bad allocation in the Nuvoton NPCM7XX
  driver"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: x86: Set default parent to 48Mhz
  clk: npcm7xx: fix memory allocation
parents 420f51f4 bded6c03

drivers/clk/clk-npcm7xx.c

+2 −2
Original line number Diff line number Diff line
@@ -558,8 +558,8 @@ static void __init npcm7xx_clk_init(struct device_node *clk_np) 
	if (!clk_base)

		goto npcm7xx_init_error;



	npcm7xx_clk_data = kzalloc(sizeof(*npcm7xx_clk_data->hws) *

		NPCM7XX_NUM_CLOCKS + sizeof(npcm7xx_clk_data), GFP_KERNEL);

	npcm7xx_clk_data = kzalloc(struct_size(npcm7xx_clk_data, hws,

				   NPCM7XX_NUM_CLOCKS), GFP_KERNEL);

	if (!npcm7xx_clk_data)

		goto npcm7xx_init_np_err;

drivers/clk/x86/clk-st.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static int st_clk_probe(struct platform_device *pdev) 
		clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),

		0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);



	clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_25M]->clk);

	clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);



	hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",

		0, st_data->base + MISCCLKCNTL1, OSCCLKENB,