dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Input: atmel_mxt_ts - use scnprintf for object sysfs entry 

Using scnprintf() is a cleaner way to ensure that we don't overwrite the
PAGE_SIZE sysfs output buffer.

Signed-off-by: Daniel Kurtz <djkurtz@chromium.org>
Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
This commit is contained in:
Daniel Kurtz 2012-06-28 21:08:07 +08:00 committed by Henrik Rydberg
parent 55d6867fe6
commit 9c67b789e0
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/input/touchscreen/atmel_mxt_ts.c
View File

@ -904,17 +904,13 @@ static ssize_t mxt_object_show(struct device *dev,
for (i = 0; i < data->info.object_num; i++) {
object = data->object_table + i;
count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"Object[%d] (Type %d)\n",
i + 1, object->type);
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
if (!mxt_object_readable(object->type)) {
count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"\n");
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
continue;
}
@ -924,15 +920,11 @@ static ssize_t mxt_object_show(struct device *dev,
if (error)
return error;
count += snprintf(buf + count, PAGE_SIZE - count,
count += scnprintf(buf + count, PAGE_SIZE - count,
"\t[%2d]: %02x (%d)\n", j, val, val);
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
}
count += snprintf(buf + count, PAGE_SIZE - count, "\n");
if (count >= PAGE_SIZE)
return PAGE_SIZE - 1;
count += scnprintf(buf + count, PAGE_SIZE - count, "\n");
}
return count;