lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 156/575] iio: ad5770r: make devicetree property reading consistent
    Date
    From: Nuno Sá <nuno.sa@analog.com>

    commit 26df977a909f818b7d346b3990735513e7e0bf93 upstream.

    The bindings file for this driver is defining the property as 'reg' but
    the driver was reading it with the 'num' name. The bindings actually had
    the 'num' property when added in
    commit ea52c21268e6 ("dt-bindings: iio: dac: Add docs for AD5770R DAC")
    and then changed it to 'reg' in
    commit 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors").
    However, both these commits landed in v5.7 so the assumption is
    that either 'num' is not being used or if it is, the validations were not
    done.

    Anyways, if someone comes back yelling about this, we might just support
    both of the properties in the future. Not ideal, but that's life...

    Fixes: 2cf3818f18b2 ("dt-bindings: iio: dac: AD5570R fix bindings errors")
    Signed-off-by: Nuno Sá <nuno.sa@analog.com>
    Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
    Link: https://lore.kernel.org/r/20210818080525.62790-1-nuno.sa@analog.com
    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/dac/ad5770r.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/iio/dac/ad5770r.c
    +++ b/drivers/iio/dac/ad5770r.c
    @@ -522,7 +522,7 @@ static int ad5770r_channel_config(struct
    return -EINVAL;

    device_for_each_child_node(&st->spi->dev, child) {
    - ret = fwnode_property_read_u32(child, "num", &num);
    + ret = fwnode_property_read_u32(child, "reg", &num);
    if (ret)
    goto err_child_out;
    if (num >= AD5770R_MAX_CHANNELS) {

    \
     
     \ /
      Last update: 2021-11-15 20:40    [W:4.467 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site