Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+3
-3
+2
-2
drivers/clk/clk-npcm7xx.c
+2
-2
drivers/clk/clk-npcm7xx.c
···
558
558
if (!clk_base)
559
559
goto npcm7xx_init_error;
560
560
561
-
npcm7xx_clk_data = kzalloc(sizeof(*npcm7xx_clk_data->hws) *
562
-
NPCM7XX_NUM_CLOCKS + sizeof(npcm7xx_clk_data), GFP_KERNEL);
561
+
npcm7xx_clk_data = kzalloc(struct_size(npcm7xx_clk_data, hws,
562
+
NPCM7XX_NUM_CLOCKS), GFP_KERNEL);
563
563
if (!npcm7xx_clk_data)
564
564
goto npcm7xx_init_np_err;
565
565
+1
-1
drivers/clk/x86/clk-st.c
+1
-1
drivers/clk/x86/clk-st.c
···
46
46
clk_oscout1_parents, ARRAY_SIZE(clk_oscout1_parents),
47
47
0, st_data->base + CLKDRVSTR2, OSCOUT1CLK25MHZ, 3, 0, NULL);
48
48
49
-
clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_25M]->clk);
49
+
clk_set_parent(hws[ST_CLK_MUX]->clk, hws[ST_CLK_48M]->clk);
50
50
51
51
hws[ST_CLK_GATE] = clk_hw_register_gate(NULL, "oscout1", "oscout1_mux",
52
52
0, st_data->base + MISCCLKCNTL1, OSCCLKENB,