aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2009-11-20 11:32:38 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2009-12-11 12:23:04 -0800
commitefdf83c1763156220a74c8f2755c1a6fa1e1c26b (patch)
treecfcce851aae04afbdd47e834909c06c19c42cb6d
parent48b1aff5b93521c5ad90842bef52b218ac50a4ab (diff)
downloadkernel_samsung_smdk4412-efdf83c1763156220a74c8f2755c1a6fa1e1c26b.zip
kernel_samsung_smdk4412-efdf83c1763156220a74c8f2755c1a6fa1e1c26b.tar.gz
kernel_samsung_smdk4412-efdf83c1763156220a74c8f2755c1a6fa1e1c26b.tar.bz2
Staging: comedi: pcl816: update convert_src mask for AI cmdtest
The COMEDI_CMDTEST ioctl needs to clear unsupported bits in the struct comedi_cmd's convert_src and other *_src members. This needs fixing in the pcl816 driver's AI cmdtest. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/comedi/drivers/pcl816.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c
index f9a0dac..1b1708a 100644
--- a/drivers/staging/comedi/drivers/pcl816.c
+++ b/drivers/staging/comedi/drivers/pcl816.c
@@ -488,7 +488,9 @@ static int pcl816_ai_cmdtest(struct comedi_device *dev,
if (!cmd->scan_begin_src || tmp != cmd->scan_begin_src)
err++;
- if (!(cmd->convert_src & (TRIG_EXT | TRIG_TIMER)))
+ tmp = cmd->convert_src;
+ cmd->convert_src &= TRIG_EXT | TRIG_TIMER;
+ if (!cmd->convert_src || tmp != cmd->convert_src)
err++;
tmp = cmd->scan_end_src;