From 77169ae33026c8992d3946b1b1535b3d22aabc9c Mon Sep 17 00:00:00 2001 From: Matthew Fornero Date: Thu, 17 Mar 2016 12:41:58 -0400 Subject: [PATCH 1/3] drivers/iio: fix iio_triggered_buffer_setup API error Fix usage of iio_triggered_buffer_setup introduced in commit f383b5650 Signed-off-by: Matthew Fornero --- drivers/iio/accel/st_accel_buffer.c | 2 +- drivers/iio/adc/ad7923.c | 2 +- drivers/iio/gyro/itg3200_buffer.c | 2 +- drivers/iio/gyro/st_gyro_buffer.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 ++- drivers/iio/magnetometer/st_magn_buffer.c | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/iio/accel/st_accel_buffer.c b/drivers/iio/accel/st_accel_buffer.c index ac75f57e712a04..62809c3dbd3a14 100644 --- a/drivers/iio/accel/st_accel_buffer.c +++ b/drivers/iio/accel/st_accel_buffer.c @@ -84,7 +84,7 @@ static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = { int st_accel_allocate_ring(struct iio_dev *indio_dev) { return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, - &st_sensors_trigger_handler); + &st_sensors_trigger_handler, &st_accel_buffer_setup_ops); } void st_accel_deallocate_ring(struct iio_dev *indio_dev) diff --git a/drivers/iio/adc/ad7923.c b/drivers/iio/adc/ad7923.c index 8ba0c78222d5d3..45e29ccd824f25 100644 --- a/drivers/iio/adc/ad7923.c +++ b/drivers/iio/adc/ad7923.c @@ -315,7 +315,7 @@ static int ad7923_probe(struct spi_device *spi) return ret; ret = iio_triggered_buffer_setup(indio_dev, NULL, - &ad7923_trigger_handler); + &ad7923_trigger_handler, NULL); if (ret) goto error_disable_reg; diff --git a/drivers/iio/gyro/itg3200_buffer.c b/drivers/iio/gyro/itg3200_buffer.c index a95ff7e702ecc0..eef50e91f17cfe 100644 --- a/drivers/iio/gyro/itg3200_buffer.c +++ b/drivers/iio/gyro/itg3200_buffer.c @@ -66,7 +66,7 @@ static irqreturn_t itg3200_trigger_handler(int irq, void *p) int itg3200_buffer_configure(struct iio_dev *indio_dev) { return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, - itg3200_trigger_handler); + itg3200_trigger_handler, NULL); } void itg3200_buffer_unconfigure(struct iio_dev *indio_dev) diff --git a/drivers/iio/gyro/st_gyro_buffer.c b/drivers/iio/gyro/st_gyro_buffer.c index 99f2f9df98706f..ef656bc8a7ce9e 100644 --- a/drivers/iio/gyro/st_gyro_buffer.c +++ b/drivers/iio/gyro/st_gyro_buffer.c @@ -84,7 +84,7 @@ static const struct iio_buffer_setup_ops st_gyro_buffer_setup_ops = { int st_gyro_allocate_ring(struct iio_dev *indio_dev) { return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, - &st_sensors_trigger_handler); + &st_sensors_trigger_handler, &st_gyro_buffer_setup_ops); } void st_gyro_deallocate_ring(struct iio_dev *indio_dev) diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c index 7915e3fac5c614..2e4626ebd8ed39 100644 --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_core.c @@ -821,7 +821,8 @@ static int inv_mpu_probe(struct i2c_client *client, result = iio_triggered_buffer_setup(indio_dev, inv_mpu6050_irq_handler, - inv_mpu6050_read_fifo + inv_mpu6050_read_fifo, + NULL ); if (result) { dev_err(&st->client->dev, "configure buffer fail %d\n", diff --git a/drivers/iio/magnetometer/st_magn_buffer.c b/drivers/iio/magnetometer/st_magn_buffer.c index 90234d9beb3be8..8e1fb19f75851b 100644 --- a/drivers/iio/magnetometer/st_magn_buffer.c +++ b/drivers/iio/magnetometer/st_magn_buffer.c @@ -66,7 +66,7 @@ static const struct iio_buffer_setup_ops st_magn_buffer_setup_ops = { int st_magn_allocate_ring(struct iio_dev *indio_dev) { return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time, - &st_sensors_trigger_handler); + &st_sensors_trigger_handler, &st_magn_buffer_setup_ops); } void st_magn_deallocate_ring(struct iio_dev *indio_dev) From 0b505cbd7e4f58e239869a347840dc83d14ac831 Mon Sep 17 00:00:00 2001 From: Matthew Fornero Date: Thu, 17 Mar 2016 12:43:45 -0400 Subject: [PATCH 2/3] drivers/iio: fix st_pressure_buffer Fix error introduced in commit eee97d1266 Signed-off-by: Matthew Fornero --- drivers/iio/pressure/st_pressure_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/pressure/st_pressure_buffer.c b/drivers/iio/pressure/st_pressure_buffer.c index ecd833a9d8e3b2..c80fa7e52823aa 100644 --- a/drivers/iio/pressure/st_pressure_buffer.c +++ b/drivers/iio/pressure/st_pressure_buffer.c @@ -53,7 +53,7 @@ static int st_press_buffer_predisable(struct iio_dev *indio_dev) err = st_sensors_set_enable(indio_dev, false); - kfree(pdata->buffer_data); + kfree(press_data->buffer_data); return err; } From 11eceb4a246d3775d32d4f8718bbdbbc43b447ee Mon Sep 17 00:00:00 2001 From: Matt Fornero Date: Tue, 1 Mar 2016 15:41:53 -0500 Subject: [PATCH 3/3] drm: fix drm_edid.h on x86 Include drm_crtc.h in drm_edid.h to fix "dereferencing pointer to incomplete type" build error on x86 introduced by commit: drm: introduce helper for accessing EDID blob in drm_connector structure 4a531879a607d9867038a6b0544a154f866c8b53 Signed-off-by: Matt Fornero --- include/drm/drm_edid.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 2fa55f981533d4..8746918e53d413 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -24,6 +24,7 @@ #define __DRM_EDID_H__ #include +#include #define EDID_LENGTH 128 #define DDC_ADDR 0x50