diff options
author | Axel Lin <axel.lin@gmail.com> | 2010-08-24 01:45:49 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-28 18:28:58 -0400 |
commit | 09ff21e0f670a71ea43765cedaab9246fd81540e (patch) | |
tree | 01b470a4d2d5849fcf8cee5175fcb946bd40c065 | |
parent | b59cedeffaef54dd091baf01fd5e276ac50a3176 (diff) |
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>
-rw-r--r-- | drivers/mfd/ezx-pcap.c | 10 |
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, | |||
384 | struct pcap_subdev *subdev) | 384 | struct pcap_subdev *subdev) |
385 | { | 385 | { |
386 | struct platform_device *pdev; | 386 | struct platform_device *pdev; |
387 | int ret; | ||
387 | 388 | ||
388 | pdev = platform_device_alloc(subdev->name, subdev->id); | 389 | pdev = platform_device_alloc(subdev->name, subdev->id); |
390 | if (!pdev) | ||
391 | return -ENOMEM; | ||
392 | |||
389 | pdev->dev.parent = &pcap->spi->dev; | 393 | pdev->dev.parent = &pcap->spi->dev; |
390 | pdev->dev.platform_data = subdev->platform_data; | 394 | pdev->dev.platform_data = subdev->platform_data; |
391 | 395 | ||
392 | return platform_device_add(pdev); | 396 | ret = platform_device_add(pdev); |
397 | if (ret) | ||
398 | platform_device_put(pdev); | ||
399 | |||
400 | return ret; | ||
393 | } | 401 | } |
394 | 402 | ||
395 | static int __devexit ezx_pcap_remove(struct spi_device *spi) | 403 | static int __devexit ezx_pcap_remove(struct spi_device *spi) |