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

Commit 62508a5d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-pinmux2-for-v3.9' of... 

Merge tag 'renesas-pinmux2-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/sh-pinmux

Bug fix from Magnus that resolves a regression introduced in pfc changes
queued up for 3.9.

* tag 'renesas-pinmux2-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  sh-pfc: sh_pfc_probe() sizeof() fix

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7e5fc779 8c43fcc7

drivers/pinctrl/sh-pfc/core.c

+1 −1
Original line number Diff line number Diff line
@@ -495,7 +495,7 @@ static int sh_pfc_probe(struct platform_device *pdev) 
	if (info == NULL)

		return -ENODEV;



	pfc = devm_kzalloc(&pdev->dev, sizeof(pfc), GFP_KERNEL);

	pfc = devm_kzalloc(&pdev->dev, sizeof(*pfc), GFP_KERNEL);

	if (pfc == NULL)

		return -ENOMEM;