* [PATCH 2/3] mfd: ezx-pcap - fix pcap_add_subdev error path
2010-08-24 5:44 [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path Axel Lin
@ 2010-08-24 5:45 ` Axel Lin
2010-08-24 5:47 ` [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs " Axel Lin
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Axel Lin @ 2010-08-24 5:45 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Daniel Ribeiro
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>
---
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 134c69a..d283d77 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)
--
1.7.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path
2010-08-24 5:44 [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path Axel Lin
2010-08-24 5:45 ` [PATCH 2/3] mfd: ezx-pcap - fix pcap_add_subdev " Axel Lin
@ 2010-08-24 5:47 ` Axel Lin
2010-08-24 6:13 ` Mike Rapoport
2010-08-24 5:47 ` [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs " Eric Miao
` (2 subsequent siblings)
4 siblings, 1 reply; 7+ messages in thread
From: Axel Lin @ 2010-08-24 5:47 UTC (permalink / raw)
To: linux-kernel; +Cc: Samuel Ortiz, Mike Rapoport
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>
---
drivers/mfd/tps6586x.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 4cde31e..1c91936 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
subdev = &pdata->subdevs[i];
pdev = platform_device_alloc(subdev->name, subdev->id);
+ if (!pdev) {
+ ret = -ENOMEM;
+ goto failed;
+ }
pdev->dev.parent = tps6586x->dev;
pdev->dev.platform_data = subdev->platform_data;
ret = platform_device_add(pdev);
- if (ret)
+ if (ret) {
+ platform_device_put(pdev);
goto failed;
+ }
}
return 0;
--
1.7.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path
2010-08-24 5:47 ` [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs " Axel Lin
@ 2010-08-24 6:13 ` Mike Rapoport
0 siblings, 0 replies; 7+ messages in thread
From: Mike Rapoport @ 2010-08-24 6:13 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Samuel Ortiz
Axel Lin wrote:
> 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>
Acked-by: Mike Rapoport <mike@compulab.co.il>
> ---
> drivers/mfd/tps6586x.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
> index 4cde31e..1c91936 100644
> --- a/drivers/mfd/tps6586x.c
> +++ b/drivers/mfd/tps6586x.c
> @@ -273,13 +273,19 @@ static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
> subdev = &pdata->subdevs[i];
>
> pdev = platform_device_alloc(subdev->name, subdev->id);
> + if (!pdev) {
> + ret = -ENOMEM;
> + goto failed;
> + }
>
> pdev->dev.parent = tps6586x->dev;
> pdev->dev.platform_data = subdev->platform_data;
>
> ret = platform_device_add(pdev);
> - if (ret)
> + if (ret) {
> + platform_device_put(pdev);
> goto failed;
> + }
> }
> return 0;
>
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path
2010-08-24 5:44 [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path Axel Lin
2010-08-24 5:45 ` [PATCH 2/3] mfd: ezx-pcap - fix pcap_add_subdev " Axel Lin
2010-08-24 5:47 ` [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs " Axel Lin
@ 2010-08-24 5:47 ` Eric Miao
2010-08-24 6:13 ` Mike Rapoport
2010-09-10 15:53 ` Samuel Ortiz
4 siblings, 0 replies; 7+ messages in thread
From: Eric Miao @ 2010-08-24 5:47 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Samuel Ortiz, Mike Rapoport
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 1601 bytes --]
On Tue, Aug 24, 2010 at 1:44 PM, Axel Lin <axel.lin@gmail.com> wrote:
> This patch fixes da903x_add_subdevs 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>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
> ---
> Â drivers/mfd/da903x.c | Â Â 8 +++++++-
> Â 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index c07aece..2fadbae 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -470,13 +470,19 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
> Â Â Â Â Â Â Â Â subdev = &pdata->subdevs[i];
>
> Â Â Â Â Â Â Â Â pdev = platform_device_alloc(subdev->name, subdev->id);
> + Â Â Â Â Â Â Â if (!pdev) {
> + Â Â Â Â Â Â Â Â Â Â Â ret = -ENOMEM;
> + Â Â Â Â Â Â Â Â Â Â Â goto failed;
> + Â Â Â Â Â Â Â }
>
> Â Â Â Â Â Â Â Â pdev->dev.parent = chip->dev;
> Â Â Â Â Â Â Â Â pdev->dev.platform_data = subdev->platform_data;
>
> Â Â Â Â Â Â Â Â ret = platform_device_add(pdev);
> - Â Â Â Â Â Â Â if (ret)
> + Â Â Â Â Â Â Â if (ret) {
> + Â Â Â Â Â Â Â Â Â Â Â platform_device_put(pdev);
> Â Â Â Â Â Â Â Â Â Â Â Â goto failed;
> + Â Â Â Â Â Â Â }
> Â Â Â Â }
> Â Â Â Â return 0;
>
> --
> 1.7.2
>
>
>
>
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path
2010-08-24 5:44 [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path Axel Lin
` (2 preceding siblings ...)
2010-08-24 5:47 ` [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs " Eric Miao
@ 2010-08-24 6:13 ` Mike Rapoport
2010-09-10 15:53 ` Samuel Ortiz
4 siblings, 0 replies; 7+ messages in thread
From: Mike Rapoport @ 2010-08-24 6:13 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Samuel Ortiz, eric miao
Axel Lin wrote:
> This patch fixes da903x_add_subdevs 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>
Acked-by: Mike Rapoport <mike@compulab.co.il>
> ---
> drivers/mfd/da903x.c | 8 +++++++-
> 1 files changed, 7 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c
> index c07aece..2fadbae 100644
> --- a/drivers/mfd/da903x.c
> +++ b/drivers/mfd/da903x.c
> @@ -470,13 +470,19 @@ static int __devinit da903x_add_subdevs(struct da903x_chip *chip,
> subdev = &pdata->subdevs[i];
>
> pdev = platform_device_alloc(subdev->name, subdev->id);
> + if (!pdev) {
> + ret = -ENOMEM;
> + goto failed;
> + }
>
> pdev->dev.parent = chip->dev;
> pdev->dev.platform_data = subdev->platform_data;
>
> ret = platform_device_add(pdev);
> - if (ret)
> + if (ret) {
> + platform_device_put(pdev);
> goto failed;
> + }
> }
> return 0;
>
--
Sincerely yours,
Mike.
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path
2010-08-24 5:44 [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path Axel Lin
` (3 preceding siblings ...)
2010-08-24 6:13 ` Mike Rapoport
@ 2010-09-10 15:53 ` Samuel Ortiz
4 siblings, 0 replies; 7+ messages in thread
From: Samuel Ortiz @ 2010-09-10 15:53 UTC (permalink / raw)
To: Axel Lin; +Cc: linux-kernel, Mike Rapoport, eric miao
Hi Axel,
On Tue, Aug 24, 2010 at 01:44:05PM +0800, Axel Lin wrote:
> This patch fixes da903x_add_subdevs error path:
> 1. return -ENOMEM if platform_device_alloc() fail.
> 2. call platform_device_put() if platform_device_add() fail.
All 3 patches applied, thanks a lot.
Cheers,
Samuel.
--
Intel Open Source Technology Centre
http://oss.intel.com/
^ permalink raw reply [flat|nested] 7+ messages in thread