lkml.org 
[lkml]   [2014]   [Oct]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 069/163] iio:inkern: fix overwritten -EPROBE_DEFER in of_iio_channel_get_by_name
    Date
    3.13.11.9 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johannes Pointner <johannes.pointner@gmail.com>

    commit 872687f626e033b4ddfaec1e410057cfc6636d77 upstream.

    Fixes: a2c12493ed7e ('iio: of_iio_channel_get_by_name() returns non-null pointers for error legs')

    which improperly assumes that of_iio_channel_get_by_name must always
    return NULL and thus now hides -EPROBE_DEFER.

    Signed-off-by: Johannes Pointner <johannes.pointner@br-automation.com>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Jonathan Cameron <jic23@kernel.org>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/iio/inkern.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
    index 1e8e94d..4fc88e6 100644
    --- a/drivers/iio/inkern.c
    +++ b/drivers/iio/inkern.c
    @@ -178,7 +178,7 @@ static struct iio_channel *of_iio_channel_get_by_name(struct device_node *np,
    index = of_property_match_string(np, "io-channel-names",
    name);
    chan = of_iio_channel_get(np, index);
    - if (!IS_ERR(chan))
    + if (!IS_ERR(chan) || PTR_ERR(chan) == -EPROBE_DEFER)
    break;
    else if (name && index >= 0) {
    pr_err("ERROR: could not get IIO channel %s:%s(%i)\n",
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-10-10 00:01    [W:4.215 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site