From 4c3909267d250a6d5ec92e82bb88bd9da100a2df Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 13 Nov 2012 17:56:11 -0700 Subject: [PATCH] --- yaml --- r: 337921 b: refs/heads/master c: 8c6c5a692d46a2f2fc589952a1f38ac1c690d3a7 h: refs/heads/master i: 337919: 69910e8087cd05a8058aafc312ec50b7273ccc8a v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/me4000.c | 17 ++++++----------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index b63c4cb8bf39..57963d1d2f61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf1b2022ef4052953b7f8e04ee3259c061561261 +refs/heads/master: 8c6c5a692d46a2f2fc589952a1f38ac1c690d3a7 diff --git a/trunk/drivers/staging/comedi/drivers/me4000.c b/trunk/drivers/staging/comedi/drivers/me4000.c index c85e5e5420b5..a489a6548e75 100644 --- a/trunk/drivers/staging/comedi/drivers/me4000.c +++ b/trunk/drivers/staging/comedi/drivers/me4000.c @@ -969,28 +969,23 @@ static int me4000_ai_do_cmd_test(struct comedi_device *dev, if (err) return 2; - /* - * Stage 3. Check if arguments are generally valid. - */ + /* Step 3: check if arguments are trivially valid */ + if (cmd->chanlist_len < 1) { - dev_err(dev->class_dev, "No channel list\n"); cmd->chanlist_len = 1; - err++; + err |= -EINVAL; } if (init_ticks < 66) { - dev_err(dev->class_dev, "Start arg to low\n"); cmd->start_arg = 2000; - err++; + err |= -EINVAL; } if (scan_ticks && scan_ticks < 67) { - dev_err(dev->class_dev, "Scan begin arg to low\n"); cmd->scan_begin_arg = 2031; - err++; + err |= -EINVAL; } if (chan_ticks < 66) { - dev_err(dev->class_dev, "Convert arg to low\n"); cmd->convert_arg = 2000; - err++; + err |= -EINVAL; } if (err)