diff --git a/[refs] b/[refs]
index ca5691cff95c..90893dcc58b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f06a23c93b900c37ef14858868c00dc8f061fa22
+refs/heads/master: 8289ad0578ad7e66b2052754746b4deb1a88cc4a
diff --git a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c
index ef4dbe5ff0b8..4dbac7459a48 100644
--- a/trunk/drivers/staging/comedi/drivers/adl_pci9118.c
+++ b/trunk/drivers/staging/comedi/drivers/adl_pci9118.c
@@ -810,7 +810,7 @@ static void pci9118_calc_divisors(char mode, struct comedi_device *dev,
 		*tim2 = *div1 * devpriv->i8254_osc_base;
 							/* real convert timer */
 
-		if (usessh & (chnsshfront == 0))	/* use BSSH signal */
+		if (usessh && (chnsshfront == 0))	/* use BSSH signal */
 			if (*div2 < (chans + 2))
 				*div2 = chans + 2;