diff options
| author | Nick Dyer <nick.dyer@itdev.co.uk> | 2015-01-06 14:11:31 +0000 |
|---|---|---|
| committer | Nick Dyer <nick.dyer@itdev.co.uk> | 2015-05-01 14:58:00 +0100 |
| commit | 81dd63bf48a1e97f7f0002b3532b3177e2a46e0f (patch) | |
| tree | c054700361aea9c34f529db3b388a0d30fd0aa57 | |
| parent | 9c18b74a85d90972601aca1b667327a7a2887c61 (diff) | |
| download | olio-linux-3.10-81dd63bf48a1e97f7f0002b3532b3177e2a46e0f.tar.xz olio-linux-3.10-81dd63bf48a1e97f7f0002b3532b3177e2a46e0f.zip | |
Input: atmel_mxt_ts - check firmware format before putting device into bootloader mode
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 7a4ed198d7e..31d28bc72b2 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -3003,12 +3003,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; |