---

yaml --- r: 317944 b: refs/heads/master c: e141869 h: refs/heads/master v: v3
git-mirror · Jul 15, 2012 · 0691953 · 0691953
1 parent ec8ff4e
commit 0691953
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4be6cd1cf63875092b468b57fbdaae946e93c631
+refs/heads/master: e141869895906799e8111edab8e88b7bbde0cae1
diff --git a/trunk/drivers/staging/comedi/drivers/rtd520.c b/trunk/drivers/staging/comedi/drivers/rtd520.c
@@ -406,10 +406,6 @@ struct rtdPrivate {
 
 /* Macros to access registers */
 
-/* Reset board state for DMA 0 */
-#define RtdDma0Reset(dev) \
-	writel(0, devpriv->las0+LAS0_DMA0_RESET)
-
 /* Reset board state for DMA 1 */
 #define RtdDma1Reset(dev) \
 	writel(0, devpriv->las0+LAS0_DMA1_SRC)
@@ -1297,7 +1293,7 @@ static int rtd_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
 			RtdDma0Control(dev, PLX_CLEAR_DMA_INTR_BIT);
 		}
 	}
-	RtdDma0Reset(dev);	/* reset onboard state */
+	writel(0, devpriv->las0 + LAS0_DMA0_RESET);
 #endif /* USE_DMA */
 	writel(0, devpriv->las0 + LAS0_ADC_FIFO_CLEAR);
 	writel(0, devpriv->las0 + LAS0_OVERRUN);