[PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[Axel Lin]

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>
---
 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

[PATCH 2/3] mfd: ezx-pcap - fix pcap_add_subdev error path

[Axel Lin]

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

[PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path

[Axel Lin]

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

Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[Eric Miao]

[-- 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¥

Re: [PATCH 3/3] mfd: tps6586x - fix tps6586x_add_subdevs error path

[Mike Rapoport]

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.

Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[Mike Rapoport]

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.

Re: [PATCH 1/3] mfd: da903x - fix da903x_add_subdevs error path

[Samuel Ortiz]

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/