summaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-02-16 11:27:19 +0100
committerArnd Bergmann <arnd@arndb.de>2013-02-16 11:27:19 +0100
commit62508a5d25e355cc19c3ade3c3b7dddc6d326cc5 (patch)
tree1e838584e302ff47a39a31c0d8e146d3128a393f /drivers/pinctrl
parent7e5fc7793179ea5ef12f4287512b142813c6ac7c (diff)
parent8c43fcc7804fc4609ccd9fa021e21f5423db9d96 (diff)
downloadop-kernel-dev-62508a5d25e355cc19c3ade3c3b7dddc6d326cc5.zip
op-kernel-dev-62508a5d25e355cc19c3ade3c3b7dddc6d326cc5.tar.gz
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: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/pinctrl')
-rw-r--r--drivers/pinctrl/sh-pfc/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c
index d323c24f..970ddff 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;
OpenPOWER on IntegriCloud