diff options
| author | Daniel Kurtz <djkurtz@chromium.org> | 2012-06-28 21:08:07 +0800 |
|---|---|---|
| committer | Henrik Rydberg <rydberg@euromail.se> | 2012-06-29 15:58:03 +0200 |
| commit | 9c67b789e051449d3914d683ba3604c5babc4dd9 (patch) | |
| tree | d1ac672c53479b2d35331df441ea4e20d10602ae /drivers/input | |
| parent | 55d6867fe659f4783e57db7b2ae0bb04e4ac816e (diff) | |
| download | linux-9c67b789e051449d3914d683ba3604c5babc4dd9.tar.gz linux-9c67b789e051449d3914d683ba3604c5babc4dd9.tar.bz2 linux-9c67b789e051449d3914d683ba3604c5babc4dd9.zip | |
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>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/touchscreen/atmel_mxt_ts.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c index 9f8dd973e5f5..55855b8c2efd 100644 --- a/drivers/input/touchscreen/atmel_mxt_ts.c +++ b/drivers/input/touchscreen/atmel_mxt_ts.c @@ -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; |