diff --git a/[refs] b/[refs] index c63989fa1b05..74ba27cabe0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3b6cf1d47508a04de859d357789a3fc0cf8c690 +refs/heads/master: 0112db36ef95e5632db071297f7df130725c47b9 diff --git a/trunk/drivers/input/tablet/aiptek.c b/trunk/drivers/input/tablet/aiptek.c index 0c78dc4ed5cf..54c8d6f49833 100644 --- a/trunk/drivers/input/tablet/aiptek.c +++ b/trunk/drivers/input/tablet/aiptek.c @@ -375,8 +375,11 @@ static int map_str_to_val(const struct aiptek_map *map, const char *str, size_t { const struct aiptek_map *p; + if (str[count - 1] == '\n') + count--; + for (p = map; p->string; p++) - if (!strncmp(str, p->string, count)) + if (!strncmp(str, p->string, count)) return p->value; return AIPTEK_INVALID_VALUE;