Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[sfrench/cifs-2.6.git] / drivers / input / touchscreen / atmel_mxt_ts.c

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 98f17fa3a8926e2e02d7e9c0bba3090291905cec..b6f75367a284ab351b4f4d20475d463ef19dd6fc 100644 (file)
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -2183,11 +2183,11 @@ static int mxt_initialize(struct mxt_data *data)
                msleep(MXT_FW_RESET_TIME);
        }
 
-       error = mxt_acquire_irq(data);
+       error = mxt_check_retrigen(data);
        if (error)
                return error;
 
-       error = mxt_check_retrigen(data);
+       error = mxt_acquire_irq(data);
        if (error)
                return error;