---

yaml --- r: 317652 b: refs/heads/master c: b436356 h: refs/heads/master v: v3
git-mirror · Jul 6, 2012 · 4f9a7b1 · 4f9a7b1
1 parent 5015244
commit 4f9a7b1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f66faa576f084bed49d4a34e0bc2289ff0d07a70
+refs/heads/master: b436356dcc67a665da07441ab113e9a5652073e5
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidas.c b/trunk/drivers/staging/comedi/drivers/cb_pcidas.c
@@ -662,23 +662,25 @@ static int caldac_read_insn(struct comedi_device *dev,
 static int dac08_write(struct comedi_device *dev, unsigned int value)
 {
 	struct cb_pcidas_private *devpriv = dev->private;
+	unsigned long cal_reg;
 
-	if (devpriv->dac08_value == value)
-		return 1;
+	if (devpriv->dac08_value != value) {
+		devpriv->dac08_value = value;
 
-	devpriv->dac08_value = value;
+		cal_reg = devpriv->control_status + CALIBRATION_REG;
 
-	outw(cal_enable_bits(dev) | (value & 0xff),
-	     devpriv->control_status + CALIBRATION_REG);
-	udelay(1);
-	outw(cal_enable_bits(dev) | SELECT_DAC08_BIT | (value & 0xff),
-	     devpriv->control_status + CALIBRATION_REG);
-	udelay(1);
-	outw(cal_enable_bits(dev) | (value & 0xff),
-	     devpriv->control_status + CALIBRATION_REG);
-	udelay(1);
+		value &= 0xff;
+		value |= cal_enable_bits(dev);
 
-	return 1;
+		/* latch the new value into the caldac */
+		outw(value, cal_reg);
+		udelay(1);
+		outw(value | SELECT_DAC08_BIT, cal_reg);
+		udelay(1);
+		outw(value, cal_reg);
+		udelay(1);
+	}
+	return 1;	/* insn->n */
 }
 
 static int dac08_write_insn(struct comedi_device *dev,