lkml.org 
[lkml]   [2010]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH 2/3] mfd: ezx-pcap - fix pcap_add_subdev error path
    From
    Date
    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




    \
     
     \ /
      Last update: 2010-08-24 07:45    [W:0.021 / U:2.908 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site