Merge branch 'release/v2.3.1'

7d25f91d · Federico Vaga · 9f7b15db · a0ea8608 · 7d25f91d · 7d25f91d
Commit 7d25f91d authored Aug 08, 2019 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 7 deletions

adc-zio.c lib/adc-zio.c +6 -6

route.c lib/route.c +1 -1

No files found.
--- a/lib/adc-zio.c
+++ b/lib/adc-zio.c
@@ -94,11 +94,6 @@ struct adc_dev *adc_zio_open(const struct adc_board_type *b,
 	if (fa->fdc < 0 || fa->fdd < 0)
 		goto out_fa_open;

-	if (flags & ADC_F_FLUSH) {
-		if (adc_acq_flush((void *)&fa->gid, ADC_FLUSH_F_ANY) < 0)
-				goto out_fa_open;
-	}
-
 	fa->gid.board = b;

 	fa->pagesize = getpagesize();
@@ -107,6 +102,11 @@ struct adc_dev *adc_zio_open(const struct adc_board_type *b,
 	if (flags & ADC_F_VERBOSE || getenv("LIB_ADC_VERBOSE"))
 		fa->flags |= ADC_FLAG_VERBOSE;

+	if (flags & ADC_F_FLUSH) {
+		if (adc_acq_flush((void *)&fa->gid, ADC_FLUSH_F_ANY) < 0)
+				goto out_fa_open;
+	}
+
 	return (void *) &fa->gid;

 out_fa_open:
@@ -171,7 +171,7 @@ int adc_zio_acq_flush(struct adc_dev *dev, unsigned int flags)
 {
 	struct __adc_dev_zio *fa = to_dev_zio(dev);

-	if (!(flags & ADC_FLUSH_F_SW)) {
+	if (!((flags & ADC_FLUSH_F_SW) || (flags == ADC_FLUSH_F_ANY))) {
 		errno = ADC_ENOFLAGS;
 		return -1;
 	}

--- a/lib/route.c
+++ b/lib/route.c
@@ -265,7 +265,7 @@ int adc_acq_flush(struct adc_dev *dev, unsigned int flags)
 		return -1;
 	}

-	if (flags & ADC_FLUSH_F_ALL) {
+	if (flags & ~ADC_FLUSH_F_ALL) {
 		errno = ADC_ENOFLAGS;
 		return -1;
 	}