diff --git a/[refs] b/[refs]
index ad47a670f591..b9e3502c0245 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c6f5af88438b3e22d56a6b2aafaee5ffc4bc030e
+refs/heads/master: 530ddf8563df4d7af8f8bdd99fa478c63805d0e3
diff --git a/trunk/drivers/staging/meilhaus/me1600_ao.c b/trunk/drivers/staging/meilhaus/me1600_ao.c
index d127c6b00307..52b3b03d7644 100644
--- a/trunk/drivers/staging/meilhaus/me1600_ao.c
+++ b/trunk/drivers/staging/meilhaus/me1600_ao.c
@@ -756,7 +756,9 @@ static int me1600_ao_io_single_write(me_subdevice_t * subdevice,
 	queue_delayed_work(instance->me1600_workqueue,
 			   &instance->ao_control_task, 1);
 
-	if ((!flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING) && ((instance->ao_regs_shadows)->trigger & instance->ao_idx)) {	//Blocking mode. Wait for software trigger.
+	if ((!(flags & ME_IO_SINGLE_TYPE_WRITE_NONBLOCKING)) &&
+	    ((instance->ao_regs_shadows)->trigger & instance->ao_idx)) {
+		/* Blocking mode. Wait for software trigger. */
 		if (time_out) {
 			delay = (time_out * HZ) / 1000;
 			if (delay == 0)
diff --git a/trunk/drivers/staging/meilhaus/me4600_ao.c b/trunk/drivers/staging/meilhaus/me4600_ao.c
index e2bec8229abd..2571caf7530c 100644
--- a/trunk/drivers/staging/meilhaus/me4600_ao.c
+++ b/trunk/drivers/staging/meilhaus/me4600_ao.c
@@ -1025,7 +1025,7 @@ static int me4600_ao_io_stream_config(me_subdevice_t * subdevice,
 	}
 
 	if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
-		if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
+		if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
 			PERROR
 			    ("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
 			return ME_ERRNO_INVALID_FLAGS;
diff --git a/trunk/drivers/staging/meilhaus/me6000_ao.c b/trunk/drivers/staging/meilhaus/me6000_ao.c
index 94f01231f79a..e1c94cb71677 100644
--- a/trunk/drivers/staging/meilhaus/me6000_ao.c
+++ b/trunk/drivers/staging/meilhaus/me6000_ao.c
@@ -1063,7 +1063,7 @@ static int me6000_ao_io_stream_config(me_subdevice_t * subdevice,
 	}
 
 	if (flags & ME_IO_STREAM_CONFIG_HARDWARE_ONLY) {
-		if (!flags & ME_IO_STREAM_CONFIG_WRAPAROUND) {
+		if (!(flags & ME_IO_STREAM_CONFIG_WRAPAROUND)) {
 			PERROR
 			    ("Hardware ME_IO_STREAM_CONFIG_HARDWARE_ONLY has to be with ME_IO_STREAM_CONFIG_WRAPAROUND.\n");
 			return ME_ERRNO_INVALID_FLAGS;