diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-02-16 11:27:19 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-02-16 11:27:19 +0100 |
| commit | 62508a5d25e355cc19c3ade3c3b7dddc6d326cc5 (patch) | |
| tree | 1e838584e302ff47a39a31c0d8e146d3128a393f | |
| parent | 7e5fc7793179ea5ef12f4287512b142813c6ac7c (diff) | |
| parent | 8c43fcc7804fc4609ccd9fa021e21f5423db9d96 (diff) | |
Merge tag 'renesas-pinmux2-for-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/sh-pinmuxsh-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>
| -rw-r--r-- | drivers/pinctrl/sh-pfc/core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index d323c24fffaf..970ddff2b0b6 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -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; |