Commit e0984bc3 authored by Ping Cheng's avatar Ping Cheng Committed by Jiri Kosina

HID: wacom - Add default permission defines for sysfs attributes

RW : ug=rw,o=r
WO : ug=w

And enabled reading relavent sysfs attributes.
Signed-off-by: default avatarPaul A. Tessier <phernost@gmail.com>
Signed-Off-by: default avatarPing Cheng <pingc@wacom.com>
Tested-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 89f2ab55
...@@ -23,6 +23,9 @@ ...@@ -23,6 +23,9 @@
#define WAC_CMD_ICON_BT_XFER 0x26 #define WAC_CMD_ICON_BT_XFER 0x26
#define WAC_CMD_RETRIES 10 #define WAC_CMD_RETRIES 10
#define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP)
#define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP)
static int wacom_get_report(struct hid_device *hdev, u8 type, u8 id, static int wacom_get_report(struct hid_device *hdev, u8 type, u8 id,
void *buf, size_t size, unsigned int retries) void *buf, size_t size, unsigned int retries)
{ {
...@@ -604,7 +607,7 @@ static ssize_t wacom_led##SET_ID##_select_show(struct device *dev, \ ...@@ -604,7 +607,7 @@ static ssize_t wacom_led##SET_ID##_select_show(struct device *dev, \
struct wacom *wacom = hid_get_drvdata(hdev); \ struct wacom *wacom = hid_get_drvdata(hdev); \
return snprintf(buf, 2, "%d\n", wacom->led.select[SET_ID]); \ return snprintf(buf, 2, "%d\n", wacom->led.select[SET_ID]); \
} \ } \
static DEVICE_ATTR(status_led##SET_ID##_select, S_IWUSR | S_IRUSR, \ static DEVICE_ATTR(status_led##SET_ID##_select, DEV_ATTR_RW_PERM, \
wacom_led##SET_ID##_select_show, \ wacom_led##SET_ID##_select_show, \
wacom_led##SET_ID##_select_store) wacom_led##SET_ID##_select_store)
...@@ -641,7 +644,7 @@ static ssize_t wacom_##name##_luminance_store(struct device *dev, \ ...@@ -641,7 +644,7 @@ static ssize_t wacom_##name##_luminance_store(struct device *dev, \
return wacom_luminance_store(wacom, &wacom->led.field, \ return wacom_luminance_store(wacom, &wacom->led.field, \
buf, count); \ buf, count); \
} \ } \
static DEVICE_ATTR(name##_luminance, S_IWUSR, \ static DEVICE_ATTR(name##_luminance, DEV_ATTR_RW_PERM, \
NULL, wacom_##name##_luminance_store) NULL, wacom_##name##_luminance_store)
DEVICE_LUMINANCE_ATTR(status0, llv); DEVICE_LUMINANCE_ATTR(status0, llv);
...@@ -683,7 +686,7 @@ static ssize_t wacom_btnimg##BUTTON_ID##_store(struct device *dev, \ ...@@ -683,7 +686,7 @@ static ssize_t wacom_btnimg##BUTTON_ID##_store(struct device *dev, \
{ \ { \
return wacom_button_image_store(dev, BUTTON_ID, buf, count); \ return wacom_button_image_store(dev, BUTTON_ID, buf, count); \
} \ } \
static DEVICE_ATTR(button##BUTTON_ID##_rawimg, S_IWUSR, \ static DEVICE_ATTR(button##BUTTON_ID##_rawimg, DEV_ATTR_WO_PERM, \
NULL, wacom_btnimg##BUTTON_ID##_store) NULL, wacom_btnimg##BUTTON_ID##_store)
DEVICE_BTNIMG_ATTR(0); DEVICE_BTNIMG_ATTR(0);
...@@ -989,7 +992,7 @@ static ssize_t wacom_store_speed(struct device *dev, ...@@ -989,7 +992,7 @@ static ssize_t wacom_store_speed(struct device *dev,
return count; return count;
} }
static DEVICE_ATTR(speed, S_IRUGO | S_IWUSR | S_IWGRP, static DEVICE_ATTR(speed, DEV_ATTR_RW_PERM,
wacom_show_speed, wacom_store_speed); wacom_show_speed, wacom_store_speed);
static struct input_dev *wacom_allocate_input(struct wacom *wacom) static struct input_dev *wacom_allocate_input(struct wacom *wacom)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment