lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 462/862] iio: inkern: fix return value in devm_of_iio_channel_get_by_name()
    Date
    From: Nuno Sá <nuno.sa@analog.com>

    [ Upstream commit 9e878dbc0e8322f8b2f5ab0093c1e89926362dbe ]

    of_iio_channel_get_by_name() can either return NULL or an error pointer
    so that only doing IS_ERR() is not enough. Fix it by checking the NULL
    pointer case and return -ENODEV in that case. Note this is done like this
    so that users of the function (which only check for error pointers) do
    not need to be changed. This is not ideal since we are losing error codes
    and as such, in a follow up change, things will be unified so that
    of_iio_channel_get_by_name() only returns error codes.

    Fixes: 6e39b145cef7 ("iio: provide of_iio_channel_get_by_name() and devm_ version it")
    Signed-off-by: Nuno Sá <nuno.sa@analog.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Link: https://lore.kernel.org/r/20220715122903.332535-3-nuno.sa@analog.com
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iio/inkern.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
    index 9d87057794fc..87fd2a0d44f2 100644
    --- a/drivers/iio/inkern.c
    +++ b/drivers/iio/inkern.c
    @@ -412,6 +412,8 @@ struct iio_channel *devm_of_iio_channel_get_by_name(struct device *dev,
    channel = of_iio_channel_get_by_name(np, channel_name);
    if (IS_ERR(channel))
    return channel;
    + if (!channel)
    + return ERR_PTR(-ENODEV);

    ret = devm_add_action_or_reset(dev, devm_iio_channel_free, channel);
    if (ret)
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 11:12    [W:3.361 / U:0.528 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site