From d508751cda6e659d815b243ebc06bf57132a2112 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 18 Jan 2009 15:34:55 +0100 Subject: [PATCH] --- yaml --- r: 141249 b: refs/heads/master c: a44522b20d24c1c2f6496106be17bc1fb6448d42 h: refs/heads/master i: 141247: 6c2c40c0b90f35df0af3150f7281c2016e0c98e7 v: v3 --- [refs] | 2 +- trunk/drivers/staging/meilhaus/me6000_ao.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 797b75cb4288..0d92a3b1612f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f4577bff8b8d03e56f1b62bedca5cd3b18f919a +refs/heads/master: a44522b20d24c1c2f6496106be17bc1fb6448d42 diff --git a/trunk/drivers/staging/meilhaus/me6000_ao.c b/trunk/drivers/staging/meilhaus/me6000_ao.c index e1c94cb71677..dcb3526d591c 100644 --- a/trunk/drivers/staging/meilhaus/me6000_ao.c +++ b/trunk/drivers/staging/meilhaus/me6000_ao.c @@ -2825,10 +2825,11 @@ int inline ao_stop_immediately(me6000_ao_subdevice_t * instance) int i; uint32_t single_mask; - single_mask = - (instance->ao_idx - ME6000_AO_SINGLE_STATUS_OFFSET < - 0) ? 0x0000 : (0x0001 << (instance->ao_idx - - ME6000_AO_SINGLE_STATUS_OFFSET)); + if (instance->ao_idx < ME6000_AO_SINGLE_STATUS_OFFSET) + single_mask = 0x0000; + else + single_mask = 0x0001 << (instance->ao_idx - + ME6000_AO_SINGLE_STATUS_OFFSET); timeout = (instance->hardware_stop_delay >