lkml.org 
[lkml]   [2021]   [Dec]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 72/88] iio: stk3310: Dont return error code in interrupt handler
    Date
    From: Lars-Peter Clausen <lars@metafoo.de>

    commit 8e1eeca5afa7ba84d885987165dbdc5decf15413 upstream.

    Interrupt handlers must return one of the irqreturn_t values. Returning a
    error code is not supported.

    The stk3310 event interrupt handler returns an error code when reading the
    flags register fails.

    Fix the implementation to always return an irqreturn_t value.

    Fixes: 3dd477acbdd1 ("iio: light: Add threshold interrupt support for STK3310")
    Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
    Link: https://lore.kernel.org/r/20211024171251.22896-3-lars@metafoo.de
    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/stk3310.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/iio/light/stk3310.c
    +++ b/drivers/iio/light/stk3310.c
    @@ -544,9 +544,8 @@ static irqreturn_t stk3310_irq_event_han
    mutex_lock(&data->lock);
    ret = regmap_field_read(data->reg_flag_nf, &dir);
    if (ret < 0) {
    - dev_err(&data->client->dev, "register read failed\n");
    - mutex_unlock(&data->lock);
    - return ret;
    + dev_err(&data->client->dev, "register read failed: %d\n", ret);
    + goto out;
    }
    event = IIO_UNMOD_EVENT_CODE(IIO_PROXIMITY, 1,
    IIO_EV_TYPE_THRESH,
    @@ -558,6 +557,7 @@ static irqreturn_t stk3310_irq_event_han
    ret = regmap_field_write(data->reg_flag_psint, 0);
    if (ret < 0)
    dev_err(&data->client->dev, "failed to reset interrupts\n");
    +out:
    mutex_unlock(&data->lock);

    return IRQ_HANDLED;

    \
     
     \ /
      Last update: 2021-12-13 10:50    [W:4.117 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site