lkml.org 
[lkml]   [2022]   [Sep]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.19 068/155] iio: light: cm3605: Fix an error handling path in cm3605_probe()
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    commit 160905549e663019e26395ed9d66c24ee2cf5187 upstream.

    The commit in Fixes also introduced a new error handling path which should
    goto the existing error handling path.
    Otherwise some resources leak.

    Fixes: 0d31d91e6145 ("iio: light: cm3605: Make use of the helper function dev_err_probe()")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/0e186de2c125b3e17476ebf9c54eae4a5d66f994.1659854238.git.christophe.jaillet@wanadoo.fr
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/iio/light/cm3605.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/iio/light/cm3605.c b/drivers/iio/light/cm3605.c
    index c721b69d5095..0b30db77f78b 100644
    --- a/drivers/iio/light/cm3605.c
    +++ b/drivers/iio/light/cm3605.c
    @@ -226,8 +226,10 @@ static int cm3605_probe(struct platform_device *pdev)
    }

    irq = platform_get_irq(pdev, 0);
    - if (irq < 0)
    - return dev_err_probe(dev, irq, "failed to get irq\n");
    + if (irq < 0) {
    + ret = dev_err_probe(dev, irq, "failed to get irq\n");
    + goto out_disable_aset;
    + }

    ret = devm_request_threaded_irq(dev, irq, cm3605_prox_irq,
    NULL, 0, "cm3605", indio_dev);
    --
    2.37.3


    \
     
     \ /
      Last update: 2022-09-06 16:11    [W:3.474 / U:0.064 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site