summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorIiro Valkonen <iiro.valkonen@atmel.com>2011-04-12 23:16:40 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-04-12 23:34:16 -0700
commit08960a070add74cda8c968b8ace5418a5acf17c3 (patch)
tree3de233d6002d928d625330a83c40c3d5515723d4 /drivers/input/touchscreen
parent910d80513056589d3b12b3aad8598d19e0a0a5bd (diff)
downloadblackbird-op-linux-08960a070add74cda8c968b8ace5418a5acf17c3.tar.gz
blackbird-op-linux-08960a070add74cda8c968b8ace5418a5acf17c3.zip
Input: atmel_mxt_ts - make CHG line high after enabling interrupts
Make the CHG line (interrupt line) go high after the interrupts have been enabled to make sure we don't miss the falling edge. Signed-off-by: Iiro Valkonen <iiro.valkonen@atmel.com> Acked-by: Joonyoung Shim <jy0922.shim@samsung.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/atmel_mxt_ts.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index a97905a17b72..2accf1dffee9 100644
--- a/drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/drivers/input/touchscreen/atmel_mxt_ts.c
@@ -814,10 +814,6 @@ static int mxt_initialize(struct mxt_data *data)
if (error)
return error;
- error = mxt_make_highchg(data);
- if (error)
- return error;
-
mxt_handle_pdata(data);
/* Backup to memory */
@@ -1005,6 +1001,10 @@ static ssize_t mxt_update_fw_store(struct device *dev,
enable_irq(data->irq);
+ error = mxt_make_highchg(data);
+ if (error)
+ return error;
+
return count;
}
@@ -1115,6 +1115,10 @@ static int __devinit mxt_probe(struct i2c_client *client,
goto err_free_object;
}
+ error = mxt_make_highchg(data);
+ if (error)
+ goto err_free_irq;
+
error = input_register_device(input_dev);
if (error)
goto err_free_irq;
OpenPOWER on IntegriCloud