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>

diff --git a/drivers/input/touchscreen/atmel_mxt_ts.c b/drivers/input/touchscreen/atmel_mxt_ts.c
index 9f8dd973e5f5299cae585fcd9b99e0abe7760b55..55855b8c2efd2278b71f38dc76752192fca5bc19 100644 (file)
--- 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;