These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / iio / accel / hid-sensor-accel-3d.c

diff --git a/kernel/drivers/iio/accel/hid-sensor-accel-3d.c b/kernel/drivers/iio/accel/hid-sensor-accel-3d.c
index 2b4fad6..ab1e238 100644 (file)
--- a/kernel/drivers/iio/accel/hid-sensor-accel-3d.c
+++ b/kernel/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -299,7 +299,6 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct accel_3d_state *accel_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 accel_3d_state));
@@ -320,21 +319,21 @@ static int hid_accel_3d_probe(struct platform_device *pdev)
                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");
                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) {
                dev_err(&pdev->dev, "failed to setup attributes\n");
                goto error_free_dev_mem;
        }
 
-       indio_dev->channels = channels;
        indio_dev->num_channels = ARRAY_SIZE(accel_3d_channels);
        indio_dev->dev.parent = &pdev->dev;
        indio_dev->info = &accel_3d_info;
@@ -400,7 +399,7 @@ static int hid_accel_3d_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct platform_device_id hid_accel_3d_ids[] = {
+static const struct platform_device_id hid_accel_3d_ids[] = {
        {
                /* Format: HID-SENSOR-usage_id_in_hex_lowercase */
                .name = "HID-SENSOR-200073",