aboutsummaryrefslogtreecommitdiff
path: root/drivers/mfd/ezx-pcap.c
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@gmail.com>2010-08-24 13:45:49 +0800
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-29 00:28:58 +0200
commit09ff21e0f670a71ea43765cedaab9246fd81540e (patch)
tree01b470a4d2d5849fcf8cee5175fcb946bd40c065 /drivers/mfd/ezx-pcap.c
parentb59cedeffaef54dd091baf01fd5e276ac50a3176 (diff)
downloadlinux-linaro-stable-09ff21e0f670a71ea43765cedaab9246fd81540e.tar.gz
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: Axel Lin <axel.lin@gmail.com> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/ezx-pcap.c')
-rw-r--r--drivers/mfd/ezx-pcap.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 134c69aa4790..d283d77937b9 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -384,12 +384,20 @@ static int __devinit pcap_add_subdev(struct pcap_chip *pcap,
struct pcap_subdev *subdev)
{
struct platform_device *pdev;
+ int ret;
pdev = platform_device_alloc(subdev->name, subdev->id);
+ if (!pdev)
+ return -ENOMEM;
+
pdev->dev.parent = &pcap->spi->dev;
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)