Re: [PATCH iio v2 3/3] imu: inv_mpu6050: cleanup on error check

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 22/01/15 03:38, Varka Bhadram wrote:
> Signed-off-by: Varka Bhadram <varkab@xxxxxxx>
Applied etc.
> ---
>  drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c |   17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> index ab8c85a..844610c 100644
> --- a/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> +++ b/drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c
> @@ -120,29 +120,28 @@ int inv_mpu6050_probe_trigger(struct iio_dev *indio_dev)
>  					  "%s-dev%d",
>  					  indio_dev->name,
>  					  indio_dev->id);
> -	if (st->trig == NULL) {
> -		ret = -ENOMEM;
> -		goto error_ret;
> -	}
> +	if (!st->trig)
> +		return -ENOMEM;
> +
>  	ret = devm_request_irq(&indio_dev->dev, st->client->irq,
>  			       &iio_trigger_generic_data_rdy_poll,
>  			       IRQF_TRIGGER_RISING,
>  			       "inv_mpu",
>  			       st->trig);
>  	if (ret)
> -		goto error_ret;
> +		return ret;
> +
>  	st->trig->dev.parent = &st->client->dev;
>  	st->trig->ops = &inv_mpu_trigger_ops;
>  	iio_trigger_set_drvdata(st->trig, indio_dev);
> +
>  	ret = iio_trigger_register(st->trig);
>  	if (ret)
> -		goto error_ret;
> +		return ret;
> +
>  	indio_dev->trig = iio_trigger_get(st->trig);
>  
>  	return 0;
> -
> -error_ret:
> -	return ret;
>  }
>  
>  void inv_mpu6050_remove_trigger(struct inv_mpu6050_state *st)
> 

--
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




[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Input]     [Linux Kernel]     [Linux SCSI]     [X.org]

  Powered by Linux