|
@@ -315,7 +315,6 @@ static int hid_incl_3d_probe(struct platform_device *pdev)
|
|
|
struct iio_dev *indio_dev;
|
|
|
struct incl_3d_state *incl_state;
|
|
|
struct hid_sensor_hub_device *hsdev = pdev->dev.platform_data;
|
|
|
- struct iio_chan_spec *channels;
|
|
|
|
|
|
indio_dev = devm_iio_device_alloc(&pdev->dev,
|
|
|
sizeof(struct incl_3d_state));
|
|
@@ -336,21 +335,22 @@ static int hid_incl_3d_probe(struct platform_device *pdev)
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
- channels = kmemdup(incl_3d_channels, sizeof(incl_3d_channels),
|
|
|
- GFP_KERNEL);
|
|
|
- if (!channels) {
|
|
|
+ indio_dev->channels = kmemdup(incl_3d_channels,
|
|
|
+ sizeof(incl_3d_channels), GFP_KERNEL);
|
|
|
+ if (!indio_dev->channels) {
|
|
|
dev_err(&pdev->dev, "failed to duplicate channels\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
- ret = incl_3d_parse_report(pdev, hsdev, channels,
|
|
|
- HID_USAGE_SENSOR_INCLINOMETER_3D, incl_state);
|
|
|
+ ret = incl_3d_parse_report(pdev, hsdev,
|
|
|
+ (struct iio_chan_spec *)indio_dev->channels,
|
|
|
+ HID_USAGE_SENSOR_INCLINOMETER_3D,
|
|
|
+ incl_state);
|
|
|
if (ret) {
|
|
|
dev_err(&pdev->dev, "failed to setup attributes\n");
|
|
|
goto error_free_dev_mem;
|
|
|
}
|
|
|
|
|
|
- indio_dev->channels = channels;
|
|
|
indio_dev->num_channels = ARRAY_SIZE(incl_3d_channels);
|
|
|
indio_dev->dev.parent = &pdev->dev;
|
|
|
indio_dev->info = &incl_3d_info;
|