From d8d39820e1a94875a0f37dca09af0369e55e8e19 Mon Sep 17 00:00:00 2001 From: Nick Dyer Date: Thu, 23 May 2013 14:17:10 +0100 Subject: [PATCH] Input: atmel_mxt_ts - Only warn when config CRC does not match The CRC will not match if the config has been upgraded (ie the info_crc doesn't match), also there are new chips with objects included in the CRC which are previous to T7, and some chips without T7, which means that this code must only produce a warning until those issues are dealt with. Signed-off-by: Nick Dyer Signed-off-by: Atul Tiwari --- drivers/input/touchscreen/atmel_mxt_ts.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 3b553bfa3a3088..d97ef15403d139 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -1566,13 +1566,10 @@ static int mxt_check_reg_init(struct mxt_data *data) data->T7_address - cfg_start_ofs, config_mem_size); - /* check the crc, calculated should same as what's in file */ - if (config_crc > 0 && (config_crc != calculated_crc)) { - dev_err(dev, "CRC mismatch in config file, calculated=%06X, file=%06X\n", + /* Check the crc, calculated should match what is in file */ + if (config_crc > 0 && (config_crc != calculated_crc)) + dev_warn(dev, "CRC mismatch in config file, calculated=%06X, file=%06X\n", calculated_crc, config_crc); - ret = 0; - goto release_mem; - } /* Write configuration as blocks */ byte_offset = 0;