Commit 71a07603 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents c5bf33d7 ffcfd071

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -21487,6 +21487,14 @@ S: Maintained 
F:	Documentation/devicetree/bindings/net/renesas,rzv2h-gbeth.yaml

F:	drivers/net/ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c









RENESAS RZ/V2H(P) RSPI DRIVER









M:	Fabrizio Castro <fabrizio.castro.jz@renesas.com>









L:	linux-spi@vger.kernel.org









L:	linux-renesas-soc@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/spi/renesas,rzv2h-rspi.yaml









F:	drivers/spi/spi-rzv2h-rspi.c

















RENESAS RZ/V2H(P) USB2PHY PORT RESET DRIVER









M:	Fabrizio Castro <fabrizio.castro.jz@renesas.com>









M:	Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>

























drivers/spi/spi-cs42l43.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -295,7 +295,7 @@ static struct spi_board_info *cs42l43_create_bridge_amp(struct cs42l43_spi *priv







	struct spi_board_info *info;



















	if (spkid >= 0) {









		props = devm_kmalloc(priv->dev, sizeof(*props), GFP_KERNEL);









		props = devm_kcalloc(priv->dev, 2, sizeof(*props), GFP_KERNEL);









		if (!props)









			return NULL;