Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186861
b: refs/heads/master
c: 639b9f1
h: refs/heads/master
i:
  186859: b432041
v: v3
  • Loading branch information
Stewart Robertson authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent ccaca17 commit fb89a92
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 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: 65d6d26c6bcd802ebe2b22a29d9b6bbebfd8d7f8
refs/heads/master: 639b9f1ee5987270be2bca4bf8b7e6110d3b47ec
12 changes: 9 additions & 3 deletions trunk/drivers/staging/comedi/drivers/ni_labpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -583,8 +583,11 @@ int labpc_common_attach(struct comedi_device *dev, unsigned long iobase,
/* analog output */
s = dev->subdevices + 1;
if (thisboard->has_ao) {
/* Could provide command support, except it only has a one sample
* hardware buffer for analog output and no underrun flag. */
/*
* Could provide command support, except it only has a
* one sample hardware buffer for analog output and no
* underrun flag.
*/
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE | SDF_GROUND;
s->n_chan = NUM_AO_CHAN;
Expand Down Expand Up @@ -1356,7 +1359,10 @@ static irqreturn_t labpc_interrupt(int irq, void *d)
}

if (devpriv->current_transfer == isa_dma_transfer) {
/* if a dma terminal count of external stop trigger has occurred */
/*
* if a dma terminal count of external stop trigger
* has occurred
*/
if (devpriv->status1_bits & DMATC_BIT ||
(thisboard->register_layout == labpc_1200_layout
&& devpriv->status2_bits & A1_TC_BIT)) {
Expand Down

0 comments on commit fb89a92

Please sign in to comment.