Commit 09ff21e0 authored by Axel Lin's avatar Axel Lin Committed by Samuel Ortiz

mfd: Fix pcap_add_subdev error path

1. return -ENOMEM if platform_device_alloc() fail.
2. call platform_device_put() if platform_device_add() fail.
Signed-off-by: default avatarAxel Lin <axel.lin@gmail.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent b59cedef
...@@ -384,12 +384,20 @@ static int __devinit pcap_add_subdev(struct pcap_chip *pcap, ...@@ -384,12 +384,20 @@ static int __devinit pcap_add_subdev(struct pcap_chip *pcap,
struct pcap_subdev *subdev) struct pcap_subdev *subdev)
{ {
struct platform_device *pdev; struct platform_device *pdev;
int ret;
pdev = platform_device_alloc(subdev->name, subdev->id); pdev = platform_device_alloc(subdev->name, subdev->id);
if (!pdev)
return -ENOMEM;
pdev->dev.parent = &pcap->spi->dev; pdev->dev.parent = &pcap->spi->dev;
pdev->dev.platform_data = subdev->platform_data; pdev->dev.platform_data = subdev->platform_data;
return platform_device_add(pdev); ret = platform_device_add(pdev);
if (ret)
platform_device_put(pdev);
return ret;
} }
static int __devexit ezx_pcap_remove(struct spi_device *spi) static int __devexit ezx_pcap_remove(struct spi_device *spi)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment