On 08/23/13 03:47, Wei Yongjun wrote: > From: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> > > Fix to return -EINTR in the error handling case instead > of 0 (ret is assigned after goto, which has no effect), > as done elsewhere in this function. > > Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx> Thanks. Applied to the togreg branch of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git Given timing I might end up ripping this out to separate it from new stuff. Jonathan > --- > drivers/iio/adc/twl6030-gpadc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c > index a558516..0ea96c0 100644 > --- a/drivers/iio/adc/twl6030-gpadc.c > +++ b/drivers/iio/adc/twl6030-gpadc.c > @@ -537,8 +537,8 @@ static int twl6030_gpadc_read_raw(struct iio_dev *indio_dev, > ret = -ETIMEDOUT; > goto err; > } else if (timeout < 0) { > - goto err; > ret = -EINTR; > + goto err; > } > > switch (mask) { > > -- > 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 > -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html