changed to scnprintf(buf, PAGE_SIZE, ... ) as suggested in sysfs.txt
for show functions

Signed-off-by: Paul A. Tessier <phern...@gmail.com>
Signed-Off-by: Ping Cheng <pi...@wacom.com>
Tested-by: Benjamin Tissoires <benjamin.tissoi...@redhat.com>
---
v2: Move actual permission to patch one.

 drivers/hid/wacom_sys.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c
index 950a205..4a7b9c8 100644
--- a/drivers/hid/wacom_sys.c
+++ b/drivers/hid/wacom_sys.c
@@ -605,7 +605,8 @@ static ssize_t wacom_led##SET_ID##_select_show(struct 
device *dev,  \
 {                                                                      \
        struct hid_device *hdev = container_of(dev, struct hid_device, dev);\
        struct wacom *wacom = hid_get_drvdata(hdev);                    \
-       return snprintf(buf, 2, "%d\n", wacom->led.select[SET_ID]);     \
+       return scnprintf(buf, PAGE_SIZE, "%d\n",                        \
+                        wacom->led.select[SET_ID]);                    \
 }                                                                      \
 static DEVICE_ATTR(status_led##SET_ID##_select, DEV_ATTR_RW_PERM,      \
                    wacom_led##SET_ID##_select_show,                    \
@@ -644,8 +645,15 @@ static ssize_t wacom_##name##_luminance_store(struct 
device *dev,  \
        return wacom_luminance_store(wacom, &wacom->led.field,          \
                                     buf, count);                       \
 }                                                                      \
+static ssize_t wacom_##name##_luminance_show(struct device *dev,       \
+       struct device_attribute *attr, char *buf)                       \
+{                                                                      \
+       struct wacom *wacom = dev_get_drvdata(dev);                     \
+       return scnprintf(buf, PAGE_SIZE, "%d\n", wacom->led.field);     \
+}                                                                      \
 static DEVICE_ATTR(name##_luminance, DEV_ATTR_RW_PERM,                 \
-                  NULL, wacom_##name##_luminance_store)
+                  wacom_##name##_luminance_show,                       \
+                  wacom_##name##_luminance_store)
 
 DEVICE_LUMINANCE_ATTR(status0, llv);
 DEVICE_LUMINANCE_ATTR(status1, hlv);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to