|
@@ -250,7 +250,6 @@ static int hid_prox_probe(struct platform_device *pdev)
|
|
struct iio_dev *indio_dev;
|
|
struct iio_dev *indio_dev;
|
|
struct prox_state *prox_state;
|
|
struct prox_state *prox_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 prox_state));
|
|
sizeof(struct prox_state));
|
|
@@ -269,20 +268,21 @@ static int hid_prox_probe(struct platform_device *pdev)
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|
|
|
|
|
|
- channels = kmemdup(prox_channels, sizeof(prox_channels), GFP_KERNEL);
|
|
|
|
- if (!channels) {
|
|
|
|
|
|
+ indio_dev->channels = kmemdup(prox_channels, sizeof(prox_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 = prox_parse_report(pdev, hsdev, channels,
|
|
|
|
|
|
+ ret = prox_parse_report(pdev, hsdev,
|
|
|
|
+ (struct iio_chan_spec *)indio_dev->channels,
|
|
HID_USAGE_SENSOR_PROX, prox_state);
|
|
HID_USAGE_SENSOR_PROX, prox_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 =
|
|
indio_dev->num_channels =
|
|
ARRAY_SIZE(prox_channels);
|
|
ARRAY_SIZE(prox_channels);
|
|
indio_dev->dev.parent = &pdev->dev;
|
|
indio_dev->dev.parent = &pdev->dev;
|