lkml.org 
[lkml]   [2020]   [Mar]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v9 45/55] Input: Atmel: improve error handling in mxt_start()
    Date
    From: Deepak Das <deepak_das@mentor.com>

    mxt_start() does not return error in any of
    the failure cases which will allow input_dev->open()
    to return success even in case of any failure.

    This commit modifies mxt_start() to return error
    in failure cases.

    Signed-off-by: Deepak Das <deepak_das@mentor.com>
    Signed-off-by: George G. Davis <george_davis@mentor.com>
    Signed-off-by: Jiada Wang <jiada_wang@mentor.com>
    ---
    drivers/input/touchscreen/atmel_mxt_ts.c | 31 ++++++++++++------------
    1 file changed, 16 insertions(+), 15 deletions(-)

    diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
    index bbec5a8e0bb6..0f7ee987a9c5 100644
    --- a/drivers/input/touchscreen/atmel_mxt_ts.c
    +++ b/drivers/input/touchscreen/atmel_mxt_ts.c
    @@ -3981,12 +3981,13 @@ static int mxt_start(struct mxt_data *data)

    switch (data->suspend_mode) {
    case MXT_SUSPEND_T9_CTRL:
    - mxt_soft_reset(data);
    -
    + ret = mxt_soft_reset(data);
    + if (ret)
    + break;
    /* Touch enable */
    /* 0x83 = SCANEN | RPTEN | ENABLE */
    - mxt_write_object(data,
    - MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0x83);
    + ret = mxt_write_object(data,
    + MXT_TOUCH_MULTI_T9, MXT_T9_CTRL, 0x83);
    break;

    case MXT_SUSPEND_REGULATOR:
    @@ -4000,27 +4001,26 @@ static int mxt_start(struct mxt_data *data)
    * Discard any touch messages still in message buffer
    * from before chip went to sleep
    */
    - mxt_process_messages_until_invalid(data);
    + ret = mxt_process_messages_until_invalid(data);
    + if (ret)
    + break;

    ret = mxt_set_t7_power_cfg(data, MXT_POWER_CFG_RUN);
    if (ret)
    - return ret;
    + break;

    /* Recalibrate since chip has been in deep sleep */
    ret = mxt_t6_command(data, MXT_COMMAND_CALIBRATE, 1, false);
    if (ret)
    - return ret;
    + break;

    ret = mxt_acquire_irq(data);
    - if (ret)
    - return ret;
    -
    - break;
    }

    - data->suspended = false;
    + if (!ret)
    + data->suspended = false;

    - return 0;
    + return ret;
    }

    static int mxt_stop(struct mxt_data *data)
    @@ -4343,6 +4343,7 @@ static int __maybe_unused mxt_resume(struct device *dev)
    struct i2c_client *client = to_i2c_client(dev);
    struct mxt_data *data = i2c_get_clientdata(client);
    struct input_dev *input_dev = data->input_dev;
    + int ret = 0;

    if (!input_dev)
    return 0;
    @@ -4352,11 +4353,11 @@ static int __maybe_unused mxt_resume(struct device *dev)
    mutex_lock(&input_dev->mutex);

    if (input_dev->users)
    - mxt_start(data);
    + ret = mxt_start(data);

    mutex_unlock(&input_dev->mutex);

    - return 0;
    + return ret;
    }

    static SIMPLE_DEV_PM_OPS(mxt_pm_ops, mxt_suspend, mxt_resume);
    --
    2.17.1
    \
     
     \ /
      Last update: 2020-03-25 14:37    [W:3.899 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site