mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-06 00:39:48 +00:00
Merge branch 'for-6.2/sensor' into for-linus
- support for more than one hinge sensor in hid-sensor-custom (Yauhen Kharuzhy)
This commit is contained in:
commit
6cd132b4f3
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue