Commit 6cd132b4 authored by Jiri Kosina's avatar Jiri Kosina

Merge branch 'for-6.2/sensor' into for-linus

- support for more than one hinge sensor in hid-sensor-custom (Yauhen Kharuzhy)
parents 54dcc80e 9d013910
...@@ -62,7 +62,7 @@ struct hid_sensor_sample { ...@@ -62,7 +62,7 @@ struct hid_sensor_sample {
u32 raw_len; u32 raw_len;
} __packed; } __packed;
static struct attribute hid_custom_attrs[] = { static struct attribute hid_custom_attrs[HID_CUSTOM_TOTAL_ATTRS] = {
{.name = "name", .mode = S_IRUGO}, {.name = "name", .mode = S_IRUGO},
{.name = "units", .mode = S_IRUGO}, {.name = "units", .mode = S_IRUGO},
{.name = "unit-expo", .mode = S_IRUGO}, {.name = "unit-expo", .mode = S_IRUGO},
...@@ -862,7 +862,7 @@ hid_sensor_register_platform_device(struct platform_device *pdev, ...@@ -862,7 +862,7 @@ hid_sensor_register_platform_device(struct platform_device *pdev,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
custom_pdev = platform_device_register_data(pdev->dev.parent, dev_name, custom_pdev = platform_device_register_data(pdev->dev.parent, dev_name,
PLATFORM_DEVID_NONE, hsdev, PLATFORM_DEVID_AUTO, hsdev,
sizeof(*hsdev)); sizeof(*hsdev));
kfree(dev_name); kfree(dev_name);
return custom_pdev; return custom_pdev;
......
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