On 22/01/15 03:38, Varka Bhadram wrote:
> Signed-off-by: Varka Bhadram <varkab@xxxxxxx>
Applied to the togreg branch of iio.git - initially pushed out as testing
for the autobuilders to play with it.
> ---
> drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> index 926fcce..c827d21 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> @@ -116,9 +116,10 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> int ret;
> struct inv_mpu6050_state *st = iio_priv(indio_dev);
>
> - st->trig = iio_trigger_alloc("%s-dev%d",
> - indio_dev->name,
> - indio_dev->id);
> + st->trig = devm_iio_trigger_alloc(&indio_dev->dev,
> + "%s-dev%d",
> + indio_dev->name,
> + indio_dev->id);
> if (st->trig == NULL) {
> ret = -ENOMEM;
> goto error_ret;
> @@ -128,7 +129,7 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
> "inv_mpu",
> st->trig);
> if (ret)
> - goto error_free_trig;
> + goto error_ret;
> st->trig->dev.parent = &st->client->dev;
> st->trig->ops = &inv_mpu_trigger_ops;
> iio_trigger_set_drvdata(st->trig, indio_dev);
> @@ -141,8 +142,6 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
>
> error_free_irq:
> free_irq(st->client->irq, st->trig);
> -error_free_trig:
> - iio_trigger_free(st->trig);
> error_ret:
> return ret;
> }
> @@ -151,5 +150,4 @@ void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
> {
> iio_trigger_unregister(st->trig);
> free_irq(st->client->irq, st->trig);
> - iio_trigger_free(st->trig);
> }
>
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
