Skip to content

Commit

Permalink
Merge tag 'renesas-pinmux2-for-v3.9' of git://git.kernel.org/pub/scm/…
Browse files Browse the repository at this point in the history
…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: Arnd Bergmann <arnd@arndb.de>
  • Loading branch information
Arnd Bergmann committed Feb 16, 2013
2 parents 7e5fc77 + 8c43fcc commit 62508a5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/pinctrl/sh-pfc/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down

0 comments on commit 62508a5

Please sign in to comment.