lkml.org 
[lkml]   [2020]   [Jun]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 082/136] extcon: adc-jack: Fix an error handling path in adc_jack_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit bc84cff2c92ae5ccb2c37da73756e7174b1b430f ]

    In some error handling paths, a call to 'iio_channel_get()' is not balanced
    by a corresponding call to 'iio_channel_release()'.

    This can be achieved easily by using the devm_ variant of
    'iio_channel_get()'.

    This has the extra benefit to simplify the remove function.

    Fixes: 19939860dcae ("extcon: adc_jack: adc-jack driver to support 3.5 pi or simliar devices")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/extcon/extcon-adc-jack.c | 3 +--
    1 file changed, 1 insertion(+), 2 deletions(-)

    diff --git a/drivers/extcon/extcon-adc-jack.c b/drivers/extcon/extcon-adc-jack.c
    index 6f6537ab0a791..59e6ca685be85 100644
    --- a/drivers/extcon/extcon-adc-jack.c
    +++ b/drivers/extcon/extcon-adc-jack.c
    @@ -128,7 +128,7 @@ static int adc_jack_probe(struct platform_device *pdev)
    for (i = 0; data->adc_conditions[i].id != EXTCON_NONE; i++);
    data->num_conditions = i;

    - data->chan = iio_channel_get(&pdev->dev, pdata->consumer_channel);
    + data->chan = devm_iio_channel_get(&pdev->dev, pdata->consumer_channel);
    if (IS_ERR(data->chan))
    return PTR_ERR(data->chan);

    @@ -170,7 +170,6 @@ static int adc_jack_remove(struct platform_device *pdev)

    free_irq(data->irq, data);
    cancel_work_sync(&data->handler.work);
    - iio_channel_release(data->chan);

    return 0;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-23 22:47    [W:4.123 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site