diff --git a/[refs] b/[refs]
index 56d4d664b356..95ac7a141696 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48b1aff5b93521c5ad90842bef52b218ac50a4ab
+refs/heads/master: efdf83c1763156220a74c8f2755c1a6fa1e1c26b
diff --git a/trunk/drivers/staging/comedi/drivers/pcl816.c b/trunk/drivers/staging/comedi/drivers/pcl816.c
index f9a0dac79eca..1b1708a58b67 100644
--- a/trunk/drivers/staging/comedi/drivers/pcl816.c
+++ b/trunk/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;