summaryrefslogtreecommitdiff
path: root/drivers/hid
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2022-12-13 16:40:18 +0300
committerJiri Kosina <jkosina@suse.cz>2022-12-13 16:40:18 +0300
commit6cd132b4f3d09b320ee81feec4c9758cd7e516ba (patch)
tree81de9586c26e5fb54899e4fabd246c18578e9b7e /drivers/hid
parent54dcc80e7d7cf012f7e9f0801430890fe0ecc72a (diff)
parent9d013910df22de91333a0acc81d1dbb115bd76f6 (diff)
downloadlinux-6cd132b4f3d09b320ee81feec4c9758cd7e516ba.tar.xz
Merge branch 'for-6.2/sensor' into for-linus
- support for more than one hinge sensor in hid-sensor-custom (Yauhen Kharuzhy)
Diffstat (limited to 'drivers/hid')
-rw-r--r--drivers/hid/hid-sensor-custom.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c
index 32c2306e240d..f444e63e9f36 100644
--- a/drivers/hid/hid-sensor-custom.c
+++ b/drivers/hid/hid-sensor-custom.c
@@ -62,7 +62,7 @@ struct hid_sensor_sample {
u32 raw_len;
} __packed;
-static struct attribute hid_custom_attrs[] = {
+static struct attribute hid_custom_attrs[HID_CUSTOM_TOTAL_ATTRS] = {
{.name = "name", .mode = S_IRUGO},
{.name = "units", .mode = S_IRUGO},
{.name = "unit-expo", .mode = S_IRUGO},
@@ -862,7 +862,7 @@ hid_sensor_register_platform_device(struct platform_device *pdev,
return ERR_PTR(-ENOMEM);
custom_pdev = platform_device_register_data(pdev->dev.parent, dev_name,
- PLATFORM_DEVID_NONE, hsdev,
+ PLATFORM_DEVID_AUTO, hsdev,
sizeof(*hsdev));
kfree(dev_name);
return custom_pdev;