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

[kvmfornfv.git] / kernel / drivers / iio / orientation / hid-sensor-rotation.c

diff --git a/kernel/drivers/iio/orientation/hid-sensor-rotation.c b/kernel/drivers/iio/orientation/hid-sensor-rotation.c
index 4afb6c7..b98b9d9 100644 (file)
--- a/kernel/drivers/iio/orientation/hid-sensor-rotation.c
+++ b/kernel/drivers/iio/orientation/hid-sensor-rotation.c
@@ -222,7 +222,6 @@ static int hid_dev_rot_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct dev_rot_state *rot_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 dev_rot_state));
@@ -243,21 +242,23 @@ static int hid_dev_rot_probe(struct platform_device *pdev)
                return ret;
        }
 
-       channels = devm_kmemdup(&pdev->dev, dev_rot_channels,
-                                       sizeof(dev_rot_channels), GFP_KERNEL);
-       if (!channels) {
+       indio_dev->channels = devm_kmemdup(&pdev->dev, dev_rot_channels,
+                                          sizeof(dev_rot_channels),
+                                          GFP_KERNEL);
+       if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
 
-       ret = dev_rot_parse_report(pdev, hsdev, channels,
-                       HID_USAGE_SENSOR_DEVICE_ORIENTATION, rot_state);
+       ret = dev_rot_parse_report(pdev, hsdev,
+                                  (struct iio_chan_spec *)indio_dev->channels,
+                                  HID_USAGE_SENSOR_DEVICE_ORIENTATION,
+                                  rot_state);
        if (ret) {
                dev_err(&pdev->dev, "failed to setup attributes\n");
                return ret;
        }
 
-       indio_dev->channels = channels;
        indio_dev->num_channels = ARRAY_SIZE(dev_rot_channels);
        indio_dev->dev.parent = &pdev->dev;
        indio_dev->info = &dev_rot_info;
@@ -321,7 +322,7 @@ static int hid_dev_rot_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct platform_device_id hid_dev_rot_ids[] = {
+static const struct platform_device_id hid_dev_rot_ids[] = {
        {
                /* Format: HID-SENSOR-usage_id_in_hex_lowercase */
                .name = "HID-SENSOR-20008a",