|
@@ -299,7 +299,6 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
|
|
struct iio_dev *indio_dev;
|
|
struct iio_dev *indio_dev;
|
|
struct accel_3d_state *accel_state;
|
|
struct accel_3d_state *accel_state;
|
|
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
|
|
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
|
|
- struct iio_chan_spec *channels;
|
|
|
|
|
|
|
|
indio_dev = devm_iio_device_alloc(&pdev->dev,
|
|
indio_dev = devm_iio_device_alloc(&pdev->dev,
|
|
sizeof(struct accel_3d_state));
|
|
sizeof(struct accel_3d_state));
|
|
@@ -320,21 +319,21 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
- channels = kmemdup(accel_3d_channels, sizeof(accel_3d_channels),
|
|
|
|
- GFP_KERNEL);
|
|
|
|
- if (!channels) {
|
|
|
|
|
|
+ indio_dev->channels = kmemdup(accel_3d_channels,
|
|
|
|
+ sizeof(accel_3d_channels), GFP_KERNEL);
|
|
|
|
+ if (!indio_dev->channels) {
|
|
dev_err(&pdev->dev, "failed to duplicate channels\n");
|
|
dev_err(&pdev->dev, "failed to duplicate channels\n");
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
|
|
- ret = accel_3d_parse_report(pdev, hsdev, channels,
|
|
|
|
- HID_USAGE_SENSOR_ACCEL_3D, accel_state);
|
|
|
|
|
|
+ ret = accel_3d_parse_report(pdev, hsdev,
|
|
|
|
+ (struct iio_chan_spec *)indio_dev->channels,
|
|
|
|
+ HID_USAGE_SENSOR_ACCEL_3D, accel_state);
|
|
if (ret) {
|
|
if (ret) {
|
|
dev_err(&pdev->dev, "failed to setup attributes\n");
|
|
dev_err(&pdev->dev, "failed to setup attributes\n");
|
|
goto error_free_dev_mem;
|
|
goto error_free_dev_mem;
|
|
}
|
|
}
|
|
|
|
|
|
- indio_dev->channels = channels;
|
|
|
|
indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);
|
|
indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);
|
|
indio_dev->dev.parent = &pdev->dev;
|
|
indio_dev->dev.parent = &pdev->dev;
|
|
indio_dev->info = &accel_3d_info;
|
|
indio_dev->info = &accel_3d_info;
|