Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 220078
b: refs/heads/master
c: a285bf9
h: refs/heads/master
v: v3
  • Loading branch information
Maurice Dawson authored and Greg Kroah-Hartman committed Oct 5, 2010
1 parent c697ca9 commit 15fedc0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 39d70a4ab178e0a44e9f31c9dd5b9555347018ec
refs/heads/master: a285bf995da256be5d96110ec0e7592cb6b2e600
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/adl_pci9118.c
Original file line number Diff line number Diff line change
Expand Up @@ -1234,7 +1234,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
* align to 32bit down
*/
}
DPRINTK("2 dmalen0=%d dmalen1=%d \n", dmalen0, dmalen1);
DPRINTK("2 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1);

/* we want wake up every scan? */
if (devpriv->ai_flags & TRIG_WAKE_EOS) {
Expand Down Expand Up @@ -1294,7 +1294,7 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
}
}

DPRINTK("3 dmalen0=%d dmalen1=%d \n", dmalen0, dmalen1);
DPRINTK("3 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1);
/* transfer without TRIG_WAKE_EOS */
if (!(devpriv->ai_flags & TRIG_WAKE_EOS)) {
/* if it's possible then allign DMA buffers to length of scan */
Expand Down Expand Up @@ -1322,13 +1322,13 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
((devpriv->ai_n_realscanlen << 1) *
devpriv->ai_scans)) {
DPRINTK
("3.0 ai_n_realscanlen=%d ai_scans=%d \n",
("3.0 ai_n_realscanlen=%d ai_scans=%d\n",
devpriv->ai_n_realscanlen,
devpriv->ai_scans);
dmalen0 =
(devpriv->ai_n_realscanlen << 1) *
devpriv->ai_scans;
DPRINTK("3.1 dmalen0=%d dmalen1=%d \n", dmalen0,
DPRINTK("3.1 dmalen0=%d dmalen1=%d\n", dmalen0,
dmalen1);
dmalen0 &= ~3L;
} else { /*
Expand All @@ -1341,21 +1341,21 @@ static int Compute_and_setup_dma(struct comedi_device *dev)
dmalen1 =
(devpriv->ai_n_realscanlen << 1) *
devpriv->ai_scans - dmalen0;
DPRINTK("3.2 dmalen0=%d dmalen1=%d \n", dmalen0,
DPRINTK("3.2 dmalen0=%d dmalen1=%d\n", dmalen0,
dmalen1);
dmalen1 &= ~3L;
}
}
}

DPRINTK("4 dmalen0=%d dmalen1=%d \n", dmalen0, dmalen1);
DPRINTK("4 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1);

/* these DMA buffer size will be used */
devpriv->dma_actbuf = 0;
devpriv->dmabuf_use_size[0] = dmalen0;
devpriv->dmabuf_use_size[1] = dmalen1;

DPRINTK("5 dmalen0=%d dmalen1=%d \n", dmalen0, dmalen1);
DPRINTK("5 dmalen0=%d dmalen1=%d\n", dmalen0, dmalen1);
#if 0
if (devpriv->ai_n_scanlen < this_board->half_fifo_size) {
devpriv->dmabuf_panic_size[0] =
Expand Down

0 comments on commit 15fedc0

Please sign in to comment.