projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4624', 'asoc/topic...
[cascardo/linux.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
2160512
..
5af7907
100644
(file)
--- a/
drivers/input/touchscreen/atmel_mxt_ts.c
+++ b/
drivers/input/touchscreen/atmel_mxt_ts.c
@@
-1093,6
+1093,19
@@
static int mxt_t6_command(struct mxt_data *data, u16 cmd_offset,
return 0;
}
return 0;
}
+static int mxt_acquire_irq(struct mxt_data *data)
+{
+ int error;
+
+ enable_irq(data->irq);
+
+ error = mxt_process_messages_until_invalid(data);
+ if (error)
+ return error;
+
+ return 0;
+}
+
static int mxt_soft_reset(struct mxt_data *data)
{
struct device *dev = &data->client->dev;
static int mxt_soft_reset(struct mxt_data *data)
{
struct device *dev = &data->client->dev;
@@
-1111,7
+1124,7
@@
static int mxt_soft_reset(struct mxt_data *data)
/* Ignore CHG line for 100ms after reset */
msleep(100);
/* Ignore CHG line for 100ms after reset */
msleep(100);
-
enable_irq(data->irq
);
+
mxt_acquire_irq(data
);
ret = mxt_wait_for_completion(data, &data->reset_completion,
MXT_RESET_TIMEOUT);
ret = mxt_wait_for_completion(data, &data->reset_completion,
MXT_RESET_TIMEOUT);
@@
-1466,19
+1479,6
@@
release_mem:
return ret;
}
return ret;
}
-static int mxt_acquire_irq(struct mxt_data *data)
-{
- int error;
-
- enable_irq(data->irq);
-
- error = mxt_process_messages_until_invalid(data);
- if (error)
- return error;
-
- return 0;
-}
-
static int mxt_get_info(struct mxt_data *data)
{
struct i2c_client *client = data->client;
static int mxt_get_info(struct mxt_data *data)
{
struct i2c_client *client = data->client;