From patchwork Wed Feb 12 08:42:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Jiada" X-Patchwork-Id: 208204 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A04A9C2BA83 for ; Wed, 12 Feb 2020 08:46:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7E92920661 for ; Wed, 12 Feb 2020 08:46:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728591AbgBLIq5 (ORCPT ); Wed, 12 Feb 2020 03:46:57 -0500 Received: from esa2.mentor.iphmx.com ([68.232.141.98]:5128 "EHLO esa2.mentor.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728603AbgBLIq5 (ORCPT ); Wed, 12 Feb 2020 03:46:57 -0500 IronPort-SDR: D1pvV3rSJ97Tl4cFDxuZSwNQtnoYxot3Eq5AWJYSIVEDTrHXZyVys2yqKTP6vfxUKK1oYFdBZp /HqOKkwly3Px4CDNfDuYxKLQ4vJu6KpcNVH00nEqIQCIFkFq/zXNHDoH7QwdE66o0h45p/PxGU iGMvvvk1Tf+mx/M3ORJK/c0h5Kn4HDkze3e8Ft+JnXXUnIwwKsEqRjuB/gyYEBmmVJ+P4jHm+4 hYtVFpKxmR7Fy/O7maD6SSVO8QwjGhKLoYXANnaXA0djjp45aLCi5vekrlx81QJRYSjP0Tgq9Z /M8= X-IronPort-AV: E=Sophos;i="5.70,428,1574150400"; d="scan'208";a="45686290" Received: from orw-gwy-01-in.mentorg.com ([192.94.38.165]) by esa2.mentor.iphmx.com with ESMTP; 12 Feb 2020 00:46:56 -0800 IronPort-SDR: G4iHbSb6oqGDlu3bACNLznyOqVs3wcG8JIf9L1DP7+2i4tycR+A3Plafinj8zd5dl0O09Ah1xs L8C8t/LRYHV2PDX/O3nCIO7U5kyI30SDnynS5Fp/8CjQFFldmBm5clzyAj8vUOJNUdwOhg7N1x MvPfgiZ96D/Lb1Aj5R3MhjoPrJRvBWCi+fv//+WMhvH2ypTEyx714NVnHaZqwupnhrj7elH7BS xFB94gpYsRAaNbrBim8KXrLHbH9lsJQlHaWVIMzw/hiUYD6x6gk17LJoGB1P7jZIc6W+kOAwEb FYE= From: Jiada Wang To: , , , , , CC: , , , , Subject: [PATCH v7 38/48] Input: Atmel: improve error handling in mxt_start() Date: Wed, 12 Feb 2020 00:42:08 -0800 Message-ID: <20200212084218.32344-39-jiada_wang@mentor.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200212084218.32344-1-jiada_wang@mentor.com> References: <20200212084218.32344-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 2a5a5a362a13..d96726fa00c5 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3971,12 +3971,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: @@ -3990,27 +3991,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) @@ -4332,6 +4332,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; @@ -4341,11 +4342,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);