From: Jiada Wang <jiada_wang@mentor.com>
To: <nick@shmanahar.org>, <dmitry.torokhov@gmail.com>
Cc: <linux-input@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<jiada_wang@mentor.com>, <george_davis@mentor.com>
Subject: [PATCH v1 24/63] Input: atmel_mxt_ts - check firmware format before entering bootloader
Date: Fri, 16 Aug 2019 17:32:59 +0900 [thread overview]
Message-ID: <20190816083338.18685-5-jiada_wang@mentor.com> (raw)
In-Reply-To: <20190816083338.18685-1-jiada_wang@mentor.com>
From: Nick Dyer <nick.dyer@itdev.co.uk>
Signed-off-by: Nick Dyer <nick.dyer@itdev.co.uk>
(cherry picked from ndyer/linux/for-upstream commit d691d3ee6c6de84b38464a423207b3e23cb9dc3a)
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index ca882231ab41..a7805df83af2 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -3347,12 +3347,12 @@ static int mxt_load_fw(struct device *dev)
return ret;
}
- ret = mxt_enter_bootloader(data);
+ /* Check for incorrect enc file */
+ ret = mxt_check_firmware_format(dev, f.fw);
if (ret)
goto release_firmware;
- /* Check for incorrect enc file */
- ret = mxt_check_firmware_format(dev, f.fw);
+ ret = mxt_enter_bootloader(data);
if (ret)
goto release_firmware;
--
2.19.2
prev parent reply other threads:[~2019-08-16 8:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-16 8:32 [PATCH v1 20/63] Input: atmel_mxt_ts - refactor firmware flash to extract context into struct Jiada Wang
2019-08-16 8:32 ` [PATCH v1 21/63] Input: atmel_mxt_ts - refactor code to enter bootloader into separate func Jiada Wang
2019-08-16 8:32 ` [PATCH v1 22/63] Input: atmel_mxt_ts - combine bootloader version query with probe Jiada Wang
2019-08-16 8:32 ` [PATCH v1 23/63] Input: atmel_mxt_ts - improve bootloader state machine handling Jiada Wang
2019-08-16 8:32 ` Jiada Wang [this message]
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=20190816083338.18685-5-jiada_wang@mentor.com \
--to=jiada_wang@mentor.com \
--cc=dmitry.torokhov@gmail.com \
--cc=george_davis@mentor.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nick@shmanahar.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).