From 6c2c40c0b90f35df0af3150f7281c2016e0c98e7 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 24 Dec 2008 16:23:37 +0100 Subject: [PATCH] --- yaml --- r: 141247 b: refs/heads/master c: 530ddf8563df4d7af8f8bdd99fa478c63805d0e3 h: refs/heads/master i: 141245: bf76b22692447039a30d7d42e410cd546c99a7f2 141243: cd090c21eff03144a25a44fdb8cf8026e9d2de0c 141239: 515885ed857542a2ea6c6bfbb46d82fc440db332 141231: 9b96e0208daa7a79a6a827d252146d12e87048ea 141215: 3c1a5fe3aadcdf7e457fbbce57bbd579190879b6 141183: 27ffa9d71f8043470fa1c4d3c058bc34540da655 v: v3 --- [refs] | 2 +- trunk/drivers/staging/meilhaus/me1600_ao.c | 4 +++- trunk/drivers/staging/meilhaus/me4600_ao.c | 2 +- trunk/drivers/staging/meilhaus/me6000_ao.c | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) 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;