Linux Input Archive on lore.kernel.org
 help / color / Atom feed
From: Jiada Wang <jiada_wang@mentor.com>
To: <nick@shmanahar.org>, <dmitry.torokhov@gmail.com>,
	<jikos@kernel.org>, <benjamin.tissoires@redhat.com>,
	<bsz@semihalf.com>, <rydberg@bitmath.org>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<erosca@de.adit-jv.com>, <Andrew_Gabbasov@mentor.com>,
	<jiada_wang@mentor.com>
Subject: [PATCH v8 42/52] Input: Atmel: improve error handling in mxt_start()
Date: Thu, 19 Mar 2020 08:00:06 -0700
Message-ID: <20200319150016.61398-43-jiada_wang@mentor.com> (raw)
In-Reply-To: <20200319150016.61398-1-jiada_wang@mentor.com>

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 6ee83eda7170..2048cfbdc80c 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3973,12 +3973,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:
@@ -3992,27 +3993,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)
@@ -4335,6 +4335,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;
@@ -4344,11 +4345,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


  parent reply index

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-19 14:59 [PATCH v8 00/52] atmel_mxt_ts misc Jiada Wang
2020-03-19 14:59 ` [PATCH v8 01/52] Input: introduce input_mt_report_slot_inactive Jiada Wang
2020-03-19 14:59 ` [PATCH v8 02/52] Input: atmel_mxt_ts - rework sysfs init/remove Jiada Wang
2020-03-19 14:59 ` [PATCH v8 03/52] Input: atmel_mxt_ts - only read messages in mxt_acquire_irq() when necessary Jiada Wang
2020-03-19 14:59 ` [PATCH v8 04/52] Input: atmel_mxt_ts - split large i2c transfers into blocks Jiada Wang
2020-03-19 14:59 ` [PATCH v8 05/52] Input: atmel_mxt_ts - output status from T48 Noise Supression Jiada Wang
2020-03-19 14:59 ` [PATCH v8 06/52] Input: atmel_mxt_ts - output status from T42 Touch Suppression Jiada Wang
2020-03-19 14:59 ` [PATCH v8 07/52] Input: atmel_mxt_ts - implement T9 vector/orientation support Jiada Wang
2020-03-19 14:59 ` [PATCH v8 08/52] Input: atmel_mxt_ts - implement T15 Key Array support Jiada Wang
2020-03-19 14:59 ` [PATCH v8 09/52] Input: atmel_mxt_ts - handle reports from T47 Stylus object Jiada Wang
2020-03-19 14:59 ` [PATCH v8 10/52] Input: atmel_mxt_ts - implement support for T107 active stylus Jiada Wang
2020-03-19 14:59 ` [PATCH v8 11/52] Input: atmel_mxt_ts - add debug for T92 gesture and T93 touch seq msgs Jiada Wang
2020-03-19 14:59 ` [PATCH v8 12/52] Input: atmel_mxt_ts - release touch state during suspend Jiada Wang
2020-03-19 14:59 ` [PATCH v8 13/52] Input: atmel_mxt_ts - add regulator control support Jiada Wang
2020-03-19 14:59 ` [PATCH v8 14/52] dt-bindings: input: atmel: add suspend mode support Jiada Wang
2020-03-19 14:59 ` [PATCH v8 15/52] Input: atmel_mxt_ts - report failures in suspend/resume Jiada Wang
2020-03-19 14:59 ` [PATCH v8 16/52] Input: atmel_mxt_ts - allow specification of firmware file name Jiada Wang
2020-03-19 14:59 ` [PATCH v8 17/52] Input: atmel_mxt_ts - handle cfg filename via pdata/sysfs Jiada Wang
2020-03-19 14:59 ` [PATCH v8 18/52] dt-bindings: input: atmel: provide name of configuration file Jiada Wang
2020-03-19 14:59 ` [PATCH v8 19/52] Input: atmel_mxt_ts - allow input name to be specified in platform data Jiada Wang
2020-03-19 14:59 ` [PATCH v8 20/52] dt-bindings: input: atmel: support to specify input name Jiada Wang
2020-03-19 14:59 ` [PATCH v8 21/52] Input: atmel_mxt_ts - add config checksum attribute to sysfs Jiada Wang
2020-03-19 14:59 ` [PATCH v8 22/52] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2020-03-19 14:59 ` [PATCH v8 23/52] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2020-03-19 14:59 ` [PATCH v8 24/52] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2020-03-19 14:59 ` [PATCH v8 25/52] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2020-03-19 14:59 ` [PATCH v8 26/52] Input: atmel_mxt_ts - rename bl_completion to chg_completion Jiada Wang
2020-03-19 14:59 ` [PATCH v8 27/52] Input: atmel_mxt_ts - make bootloader interrupt driven Jiada Wang
2020-03-19 14:59 ` [PATCH v8 28/52] Input: atmel_mxt_ts - delay enabling IRQ when not using regulators Jiada Wang
2020-03-19 14:59 ` [PATCH v8 29/52] Input: atmel_mxt_ts - implement I2C retries Jiada Wang
2020-03-19 14:59 ` [PATCH v8 30/52] Input: atmel_mxt_ts - orientation is not present in hover Jiada Wang
2020-03-19 14:59 ` [PATCH v8 31/52] Input: atmel_mxt_ts - implement debug output for messages Jiada Wang
2020-03-19 14:59 ` [PATCH v8 32/52] Input: atmel_mxt_ts - implement improved debug message interface Jiada Wang
2020-03-19 14:59 ` [PATCH v8 33/52] Input: atmel_mxt_ts - eliminate data->raw_info_block Jiada Wang
2020-03-19 14:59 ` [PATCH v8 34/52] Input: atmel_mxt_ts - Change call-points of mxt_free_* functions Jiada Wang
2020-03-19 14:59 ` [PATCH v8 35/52] Input: atmel_mxt_ts - rely on calculated_crc rather than file config_crc Jiada Wang
2020-03-19 15:00 ` [PATCH v8 36/52] input: atmel_mxt_ts: export GPIO reset line via sysfs Jiada Wang
2020-03-19 15:00 ` [PATCH v8 37/52] input: atmel_mxt_ts: Add Missing Delay for reset handling of Atmel touch panel controller in detachable displays Jiada Wang
2020-03-19 15:00 ` [PATCH v8 38/52] Input: atmel_mxt_ts: Add support for run self-test routine Jiada Wang
2020-03-19 15:00 ` [PATCH v8 39/52] Input: atmel_mxt_ts: Limit the max bytes transferred in an i2c transaction Jiada Wang
2020-03-19 15:00 ` [PATCH v8 40/52] dt-bindings: input: atmel: support to set max bytes transferred Jiada Wang
2020-03-19 15:00 ` [PATCH v8 41/52] Input: atmel_mxt_ts: return error from mxt_process_messages_until_invalid() Jiada Wang
2020-03-19 15:00 ` Jiada Wang [this message]
2020-03-19 15:00 ` [PATCH v8 43/52] Input: Atmel: improve error handling in mxt_initialize() Jiada Wang
2020-03-19 15:00 ` [PATCH v8 44/52] Input: Atmel: improve error handling in mxt_update_cfg() Jiada Wang
2020-03-19 15:00 ` [PATCH v8 45/52] Input: Atmel: Improve error handling in mxt_initialize_input_device() Jiada Wang
2020-03-19 15:00 ` [PATCH v8 46/52] Input: Atmel: handle ReportID "0x00" while processing T5 messages Jiada Wang
2020-03-19 15:00 ` [PATCH v8 47/52] Input: Atmel: use T44 object to process " Jiada Wang
2020-03-19 15:00 ` [PATCH v8 48/52] Input: atmel_mxt_ts: use gpiod_set_value_cansleep for reset pin Jiada Wang
2020-03-19 15:00 ` [PATCH v8 49/52] input: touchscreen: atmel_mxt_ts: Added sysfs entry for touchscreen status Jiada Wang
2020-03-19 15:00 ` [PATCH v8 50/52] input: atmel_mxt_ts: added sysfs interface to update atmel T38 data Jiada Wang
2020-03-19 15:00 ` [PATCH v8 51/52] Input: atmel_mxt_ts: Implement synchronization during various operation Jiada Wang
2020-03-19 15:00 ` [PATCH v8 52/52] Input: atmel_mxt_ts - Fix compilation warning Jiada Wang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200319150016.61398-43-jiada_wang@mentor.com \
    --to=jiada_wang@mentor.com \
    --cc=Andrew_Gabbasov@mentor.com \
    --cc=benjamin.tissoires@redhat.com \
    --cc=bsz@semihalf.com \
    --cc=dmitry.torokhov@gmail.com \
    --cc=erosca@de.adit-jv.com \
    --cc=jikos@kernel.org \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nick@shmanahar.org \
    --cc=rydberg@bitmath.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux Input Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-input/0 linux-input/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-input linux-input/ https://lore.kernel.org/linux-input \
		linux-input@vger.kernel.org
	public-inbox-index linux-input

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-input


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git