Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'clk-microchip-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-fixes
Pull a microchip clk driver fix from Claudiu Beznea:
- Fix out of bounds access for MPFS CCC clock controller
* tag 'clk-microchip-fixes-7.0' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
clk: microchip: mpfs-ccc: fix out of bounds access during output registration
+5
-1
+5
-1
drivers/clk/microchip/clk-mpfs-ccc.c
+5
-1
drivers/clk/microchip/clk-mpfs-ccc.c
···
178
178
return dev_err_probe(dev, ret, "failed to register clock id: %d\n",
179
179
out_hw->id);
180
180
181
-
data->hw_data.hws[out_hw->id] = &out_hw->divider.hw;
181
+
data->hw_data.hws[out_hw->id - 2] = &out_hw->divider.hw;
182
182
}
183
183
184
184
return 0;
···
234
234
unsigned int num_clks;
235
235
int ret;
236
236
237
+
/*
238
+
* If DLLs get added here, mpfs_ccc_register_outputs() currently packs
239
+
* sparse clock IDs in the hws array
240
+
*/
237
241
num_clks = ARRAY_SIZE(mpfs_ccc_pll_clks) + ARRAY_SIZE(mpfs_ccc_pll0out_clks) +
238
242
ARRAY_SIZE(mpfs_ccc_pll1out_clks);
239
243