korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-24 20:54:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

HID: sensor: fix attributes in HID sensor interface

Browse Source 
User is unable to access to input-X-yyy and feature-X-yyy where
X is a hex value and more than 9 (e.g. input-a-yyy, feature-b-yyy) in HID
sensor custom sysfs interface.
This is because when creating the attribute, the attribute index is
written to using %x (hex). However, when reading and writing values into
the attribute, the attribute index is scanned using %d (decimal). Hence,
user is unable to access to attributes with index in hex values
(e.g. 'a', 'b', 'c') but able to access to attributes with index in
decimal values (e.g. 1, 2, 3,..).
This fix will change input-%d-%x-%s and feature-%d-%x-%s to input-%x-%x-%s
and feature-%x-%x-%s in show_values() and store_values() accordingly.

Signed-off-by: Ooi, Joyce <joyce.ooi@intel.com>
Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Ooi, Joyce 2016-11-03 18:55:15 +08:00 committed by Jiri Kosina
parent 021afd55e2
commit 4c4480aad0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/hid/hid-sensor-custom.c
View File

@ -292,11 +292,11 @@ static ssize_t show_value(struct device *dev, struct device_attribute *attr,
bool input = false; bool input = false;
int value = 0; int value = 0;
if (sscanf(attr->attr.name, "feature-%d-%x-%s", &index, &usage, if (sscanf(attr->attr.name, "feature-%x-%x-%s", &index, &usage,
name) == 3) { name) == 3) {
feature = true; feature = true;
field_index = index + sensor_inst->input_field_count; field_index = index + sensor_inst->input_field_count;
} else if (sscanf(attr->attr.name, "input-%d-%x-%s", &index, &usage, } else if (sscanf(attr->attr.name, "input-%x-%x-%s", &index, &usage,
name) == 3) { name) == 3) {
input = true; input = true;
field_index = index; field_index = index;
@ -398,7 +398,7 @@ static ssize_t store_value(struct device *dev, struct device_attribute *attr,
char name[HID_CUSTOM_NAME_LENGTH]; char name[HID_CUSTOM_NAME_LENGTH];
int value; int value;
if (sscanf(attr->attr.name, "feature-%d-%x-%s", &index, &usage, if (sscanf(attr->attr.name, "feature-%x-%x-%s", &index, &usage,
name) == 3) { name) == 3) {
field_index = index + sensor_inst->input_field_count; field_index = index + sensor_inst->input_field_count;
} else } else