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

[kvmfornfv.git] / kernel / drivers / iio / pressure / hid-sensor-press.c

diff --git a/kernel/drivers/iio/pressure/hid-sensor-press.c b/kernel/drivers/iio/pressure/hid-sensor-press.c
index 3cf0bd6..6848d8c 100644 (file)
--- a/kernel/drivers/iio/pressure/hid-sensor-press.c
+++ b/kernel/drivers/iio/pressure/hid-sensor-press.c
@@ -260,7 +260,6 @@ static int hid_press_probe(struct platform_device *pdev)
        struct iio_dev *indio_dev;
        struct press_state *press_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 press_state));
@@ -280,20 +279,21 @@ static int hid_press_probe(struct platform_device *pdev)
                return ret;
        }
 
-       channels = kmemdup(press_channels, sizeof(press_channels), GFP_KERNEL);
-       if (!channels) {
+       indio_dev->channels = kmemdup(press_channels, sizeof(press_channels),
+                                     GFP_KERNEL);
+       if (!indio_dev->channels) {
                dev_err(&pdev->dev, "failed to duplicate channels\n");
                return -ENOMEM;
        }
 
-       ret = press_parse_report(pdev, hsdev, channels,
-                               HID_USAGE_SENSOR_PRESSURE, press_state);
+       ret = press_parse_report(pdev, hsdev,
+                                (struct iio_chan_spec *)indio_dev->channels,
+                                HID_USAGE_SENSOR_PRESSURE, press_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(press_channels);
        indio_dev->dev.parent = &pdev->dev;
@@ -360,7 +360,7 @@ static int hid_press_remove(struct platform_device *pdev)
        return 0;
 }
 
-static struct platform_device_id hid_press_ids[] = {
+static const struct platform_device_id hid_press_ids[] = {
        {
                /* Format: HID-SENSOR-usage_id_in_hex_lowercase */
                .name = "HID-SENSOR-200031",