diff options
| author | Michael Ellerman | 2015-11-05 09:35:12 +0100 |
|---|---|---|
| committer | Michael Ellerman | 2015-11-05 09:35:12 +0100 |
| commit | 8bdf2023e238ce2262d0cf1aca78785dc46e15db (patch) | |
| tree | 3fc66bb23f987ec6d6108074e731a84eb3574250 /arch/powerpc/platforms/52xx/mpc52xx_gpt.c | |
| parent | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/scottwoo... (diff) | |
| parent | powerpc: Introduce the use of the managed version of kzalloc (diff) | |
| download | kernel-qcow2-linux-8bdf2023e238ce2262d0cf1aca78785dc46e15db.tar.gz kernel-qcow2-linux-8bdf2023e238ce2262d0cf1aca78785dc46e15db.tar.xz kernel-qcow2-linux-8bdf2023e238ce2262d0cf1aca78785dc46e15db.zip | |
Merge branch 'next' of git://git.denx.de/linux-denx-agust into next
MPC5xxx updates from Anatolij:
"Highlights include a driver for MPC512x LocalPlus Bus FIFO with its
device tree binding documentation, mpc512x device tree updates and some
minor fixes."
Diffstat (limited to 'arch/powerpc/platforms/52xx/mpc52xx_gpt.c')
| -rw-r--r-- | arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c index 78ac19aefa4d..3048e34db6d8 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_gpt.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_gpt.c @@ -724,7 +724,7 @@ static int mpc52xx_gpt_probe(struct platform_device *ofdev) { struct mpc52xx_gpt_priv *gpt; - gpt = kzalloc(sizeof *gpt, GFP_KERNEL); + gpt = devm_kzalloc(&ofdev->dev, sizeof *gpt, GFP_KERNEL); if (!gpt) return -ENOMEM; @@ -732,10 +732,8 @@ static int mpc52xx_gpt_probe(struct platform_device *ofdev) gpt->dev = &ofdev->dev; gpt->ipb_freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node); gpt->regs = of_iomap(ofdev->dev.of_node, 0); - if (!gpt->regs) { - kfree(gpt); + if (!gpt->regs) return -ENOMEM; - } dev_set_drvdata(&ofdev->dev, gpt); |