Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324839
b: refs/heads/master
c: a2b7bca
h: refs/heads/master
i:
  324837: d14fbf7
  324835: ee60e3a
  324831: 07e7c27
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent b276fec commit 1c1946e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 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: 2b36ab6c6f6931509b0445e8e229162ef004c61e
refs/heads/master: a2b7bcac20ca917b481c2ac5941c339d06b6d211
13 changes: 4 additions & 9 deletions trunk/drivers/staging/comedi/drivers/adv_pci_dio.c
Original file line number Diff line number Diff line change
Expand Up @@ -955,19 +955,17 @@ static int pci_dio_reset(struct comedi_device *dev)
static int pci1760_attach(struct comedi_device *dev)
{
struct comedi_subdevice *s;
int subdev = 0;

s = &dev->subdevices[subdev];
s = &dev->subdevices[0];
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = 8;
s->maxdata = 1;
s->len_chanlist = 8;
s->range_table = &range_digital;
s->insn_bits = pci1760_insn_bits_di;
subdev++;

s = &dev->subdevices[subdev];
s = &dev->subdevices[1];
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = 8;
Expand All @@ -976,18 +974,16 @@ static int pci1760_attach(struct comedi_device *dev)
s->range_table = &range_digital;
s->state = 0;
s->insn_bits = pci1760_insn_bits_do;
subdev++;

s = &dev->subdevices[subdev];
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_TIMER;
s->subdev_flags = SDF_WRITABLE | SDF_LSAMPL;
s->n_chan = 2;
s->maxdata = 0xffffffff;
s->len_chanlist = 2;
/* s->insn_config=pci1760_insn_pwm_cfg; */
subdev++;

s = &dev->subdevices[subdev];
s = &dev->subdevices[3];
s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 8;
Expand All @@ -996,7 +992,6 @@ static int pci1760_attach(struct comedi_device *dev)
s->insn_read = pci1760_insn_cnt_read;
s->insn_write = pci1760_insn_cnt_write;
/* s->insn_config=pci1760_insn_cnt_cfg; */
subdev++;

return 0;
}
Expand Down

0 comments on commit 1c1946e

Please sign in to comment.