---

yaml --- r: 337265 b: refs/heads/master c: 87c4e2c h: refs/heads/master i: 337263: 4398676 v: v3
git-mirror · Oct 25, 2012 · 1d00e9b · 1d00e9b
1 parent 710bc7c
commit 1d00e9b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be2fcdbf91f77c7658f87a782a86a3cfc0775b2d
+refs/heads/master: 87c4e2c62e507625af7cab5f46a019ab17d95bb7
diff --git a/trunk/drivers/staging/comedi/drivers/cb_pcidda.c b/trunk/drivers/staging/comedi/drivers/cb_pcidda.c
@@ -97,7 +97,7 @@
 /* manual says to set this bit with no explanation */
 #define DUMMY_BIT       0x40
 
-#define DADATA	8		/*  FIRST D/A DATA REGISTER (0) */
+#define CB_DDA_DA_DATA_REG(x)		(0x08 + ((x) * 2))
 
 static const struct comedi_lrange cb_pcidda_ranges = {
 	6, {
@@ -393,7 +393,7 @@ static int cb_pcidda_ao_winsn(struct comedi_device *dev,
 	outw(ctrl, dev->iobase + CB_DDA_DA_CTRL_REG);
 
 	/* write data */
-	outw(data[0], dev->iobase + DADATA + channel * 2);
+	outw(data[0], dev->iobase + CB_DDA_DA_DATA_REG(channel));
 
 	/* return the number of samples read/written */
 	return 1;