From patchwork Fri Nov 22 08:23:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 11257429 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B313E1871 for ; Fri, 22 Nov 2019 08:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9DF7D20714 for ; Fri, 22 Nov 2019 08:26:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727689AbfKVI03 (ORCPT ); Fri, 22 Nov 2019 03:26:29 -0500 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:52542 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727684AbfKVI02 (ORCPT ); Fri, 22 Nov 2019 03:26:28 -0500 IronPort-SDR: A2FizKez/TzSTNeVIsmqayaDj7Q70IhP+Fs2gAMEgGiLoL3wOef4dapzbLcBkto0uHA0Us8iT+ ZykxH6AA2dGVKlKJAXbyiITC6ci9r/N7QF8uzV5S+omDGpOEx0DkOzNcpNGCoNzabTJDTQlhRQ o+vCVeGNMMKnp0hD+aVz298G0kS7GVpqt7xmGHDrxcEbZYtF78mkZoLQRXqaaQ90jsxA+yx63y UL/SHr0VZkaj++a1mMcBBf9u5JvhotUDUKpq3GXZVKE54naTX1VcBZBanvEc6AUxYHCmArLCxn t78= X-IronPort-AV: E=Sophos;i="5.69,229,1571731200"; d="scan'208";a="43358977" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 22 Nov 2019 00:26:27 -0800 IronPort-SDR: X36I+h29kYB8JKFqBgPfVSadAyhw1J0RpcInGTjZNM4Em+v2OSBRgAbEPFXQnidm2scBycIeBW cegempuayYyTa7L0FgO6X8J0B47r+yxRvEEsykgNPbvF+do15BEq7zkbu/SI9yKu98e/C4snUi chfbKycYNaH+maUPG8joOeM/P0P0A6LyVvGZMURm71jW1lfJQeXVUqY6qRSvYc7vxMmVpAmPbu DvhDYsoDXO5VCyBhW7XuRNDX/Py0b8dr2ryJFVjDatahPoqMgSx9IkDJH1chk/s+/bGA52/zON nzQ= From: Jiada Wang To: , , , , CC: , , , , Subject: [PATCH v6 38/48] Input: Atmel: improve error handling in mxt_start() Date: Fri, 22 Nov 2019 17:23:52 +0900 Message-ID: <20191122082402.18173-39-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191122082402.18173-1-jiada_wang@mentor.com> References: <20191122082402.18173-1-jiada_wang@mentor.com> MIME-Version: 1.0 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org From: Deepak Das 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 Signed-off-by: George G. Davis Signed-off-by: Jiada Wang --- 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 a5af1f91d704..1ebdca1ed815 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3974,12 +3974,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: @@ -3993,27 +3994,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) @@ -4333,6 +4333,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; @@ -4340,11 +4341,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);