---

yaml --- r: 141249 b: refs/heads/master c: a44522b h: refs/heads/master i: 141247: 6c2c40c v: v3
git-mirror · Apr 3, 2009 · d508751 · d508751
1 parent 15c7c2a
commit d508751
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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 >