summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Jung <djung@nvidia.com>2014-03-14 17:09:08 -0700
committerHarry Hong <hhong@nvidia.com>2014-03-19 21:34:15 -0700
commit978d5b001e2694e4063c3d4a37603d7192f7aa60 (patch)
tree71cc52fc0f0ad28300807184b51a006f0d5ddec3
parentb9e88f59b1ee9105860849d51ab8bf16afc0b7b9 (diff)
input: touch: maxim: update delay
Maxim code drop to update delay for legacy irq. Bug 1478046 Change-Id: Id3c0f0e173f7b46afcdca7c7c29aa2e2c0bdaec6 Signed-off-by: David Jung <djung@nvidia.com> Reviewed-on: http://git-master/r/382243 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Youngjin Kim <nkim@nvidia.com> Reviewed-by: David Pu <dpu@nvidia.com> Reviewed-by: Harry Hong <hhong@nvidia.com>
-rw-r--r--drivers/input/touchscreen/maxim_sti.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/input/touchscreen/maxim_sti.c b/drivers/input/touchscreen/maxim_sti.c
index 5108f6ca4b71..35e9fdab4b7d 100644
--- a/drivers/input/touchscreen/maxim_sti.c
+++ b/drivers/input/touchscreen/maxim_sti.c
@@ -1393,7 +1393,7 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
sizeof(*async_data) + dd->irq_param[4] +
2 * sizeof(u16));
if (async_data == NULL) {
- ERROR("can't add data to async IRQ buffer");
+ INFO("can't add data to async IRQ buffer");
return;
}
async_data->length = dd->irq_param[4] + 2 * sizeof(u16);
@@ -1415,11 +1415,10 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
return;
}
- if (rx_limit == rx_len)
- usleep_range(200, 300);
+ usleep_range(310, 335);
if (buf[0] == 0x6060) {
- ERROR("data not ready");
+ INFO("data not ready");
start_legacy_acceleration_canned(dd);
ret = -EBUSY;
break;
@@ -1430,7 +1429,7 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
if (async_data->address +
offset / sizeof(u16) != buf[1]) {
- ERROR("sequence number incorrect %04X", buf[1]);
+ INFO("sequence number incorrect %04X", buf[1]);
start_legacy_acceleration_canned(dd);
ret = -EBUSY;
break;
@@ -1444,7 +1443,7 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
async_data->status = *(buf + rx_len / sizeof(u16) + 2);
if (ret < 0) {
- ERROR("can't read IRQ buffer (%d)", ret);
+ INFO("can't read IRQ buffer (%d)", ret);
nl_msg_init(dd->outgoing_skb->data, dd->nl_family.id,
dd->nl_seq - 1, MC_FUSION);
} else {
@@ -1454,7 +1453,7 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
dd->nl_mc_groups[MC_FUSION].id,
GFP_KERNEL);
if (ret < 0) {
- ERROR("can't send IRQ buffer %d", ret);
+ INFO("can't send IRQ buffer %d", ret);
msleep(300);
if (++dd->send_fail_count >= 10 &&
dd->fusion_process != (pid_t)0) {
@@ -1468,7 +1467,7 @@ static void service_irq_legacy_acceleration(struct dev_data *dd)
}
ret = nl_msg_new(dd, MC_FUSION);
if (ret < 0)
- ERROR("could not allocate outgoing skb (%d)", ret);
+ INFO("could not allocate outgoing skb (%d)", ret);
}
}