From cd669984e6f66f5ee493f504f41d02d1b7a80363 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 11 Sep 2012 10:48:28 -0700 Subject: [PATCH] --- yaml --- r: 325154 b: refs/heads/master c: e990333d11d8d37d802c8c2f22acf1b0461bd7c9 h: refs/heads/master v: v3 --- [refs] | 2 +- .../staging/comedi/drivers/adl_pci9111.c | 21 +++++++------------ 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index 7d5bfeca4530..181bdb379d46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6c39eed00cb28d4997ddf3a7aa96a1aff48c8828 +refs/heads/master: e990333d11d8d37d802c8c2f22acf1b0461bd7c9 diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c index 152d682913c8..7f7efe144327 100644 --- a/trunk/drivers/staging/comedi/drivers/adl_pci9111.c +++ b/trunk/drivers/staging/comedi/drivers/adl_pci9111.c @@ -366,27 +366,22 @@ static int pci9111_ai_do_cmd_test(struct comedi_device *dev, if (error) return 1; - /* step 2 : make sure trigger sources are unique and mutually - * compatible */ + /* Step 2a : make sure trigger sources are unique */ - if ((cmd->scan_begin_src != TRIG_TIMER) && - (cmd->scan_begin_src != TRIG_FOLLOW) && - (cmd->scan_begin_src != TRIG_EXT)) - error++; + error |= cfc_check_trigger_is_unique(cmd->scan_begin_src); + error |= cfc_check_trigger_is_unique(cmd->convert_src); + error |= cfc_check_trigger_is_unique(cmd->stop_src); + + /* Step 2b : and mutually compatible */ - if ((cmd->convert_src != TRIG_TIMER) && (cmd->convert_src != TRIG_EXT)) - error++; if ((cmd->convert_src == TRIG_TIMER) && !((cmd->scan_begin_src == TRIG_TIMER) || (cmd->scan_begin_src == TRIG_FOLLOW))) - error++; + error |= -EINVAL; if ((cmd->convert_src == TRIG_EXT) && !((cmd->scan_begin_src == TRIG_EXT) || (cmd->scan_begin_src == TRIG_FOLLOW))) - error++; - - if ((cmd->stop_src != TRIG_COUNT) && (cmd->stop_src != TRIG_NONE)) - error++; + error |= -EINVAL; if (error) return 2;