Skip to content

Commit 71a0760

Browse files
committed
Merge tag 'spi-fix-v6.17-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown: "There's one fix here for an issue with the CS42L43 where we were allocating a single property for client devices as just that property rather than a terminated array of properties like we are supposed to. We also have an update to the MAINTAINERS file for some Renesas devices" * tag 'spi-fix-v6.17-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: cs42l43: Property entry should be a null-terminated array MAINTAINERS: Add entries for the RZ/V2H(P) RSPI
2 parents c5bf33d + ffcfd07 commit 71a0760

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

MAINTAINERS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21487,6 +21487,14 @@ S: Maintained
2148721487
F: Documentation/devicetree/bindings/net/renesas,rzv2h-gbeth.yaml
2148821488
F: drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c
2148921489

21490+
RENESAS RZ/V2H(P) RSPI DRIVER
21491+
M: Fabrizio Castro <[email protected]>
21492+
21493+
21494+
S: Maintained
21495+
F: Documentation/devicetree/bindings/spi/renesas,rzv2h-rspi.yaml
21496+
F: drivers/spi/spi-rzv2h-rspi.c
21497+
2149021498
RENESAS RZ/V2H(P) USB2PHY PORT RESET DRIVER
2149121499
M: Fabrizio Castro <[email protected]>
2149221500
M: Lad Prabhakar <[email protected]>

drivers/spi/spi-cs42l43.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ static struct spi_board_info *cs42l43_create_bridge_amp(struct cs42l43_spi *priv
295295
struct spi_board_info *info;
296296

297297
if (spkid >= 0) {
298-
props = devm_kmalloc(priv->dev, sizeof(*props), GFP_KERNEL);
298+
props = devm_kcalloc(priv->dev, 2, sizeof(*props), GFP_KERNEL);
299299
if (!props)
300300
return NULL;
301301

0 commit comments

Comments
 (0)