Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324833
b: refs/heads/master
c: 573e31a
h: refs/heads/master
i:
  324831: 07e7c27
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 7b1b417 commit e2f0880
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: d1d7b20def05f0278033c9b12d319b6fd735f7b8
refs/heads/master: 573e31af7cb709dad96bb8d9dd7140d3b2f57071
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/adl_pci9111.c
Original file line number Diff line number Diff line change
Expand Up @@ -1322,7 +1322,7 @@ static int pci9111_attach(struct comedi_device *dev,
if (error)
return error;

s = dev->subdevices + 0;
s = &dev->subdevices[0];
dev->read_subdev = s;

s->type = COMEDI_SUBD_AI;
Expand All @@ -1342,7 +1342,7 @@ static int pci9111_attach(struct comedi_device *dev,
s->do_cmd = pci9111_ai_do_cmd;
s->munge = pci9111_ai_munge;

s = dev->subdevices + 1;
s = &dev->subdevices[1];
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_COMMON;
s->n_chan = board->ao_channel_nbr;
Expand All @@ -1352,15 +1352,15 @@ static int pci9111_attach(struct comedi_device *dev,
s->insn_write = pci9111_ao_insn_write;
s->insn_read = pci9111_ao_insn_read;

s = dev->subdevices + 2;
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE;
s->n_chan = PCI9111_DI_CHANNEL_NBR;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_bits = pci9111_di_insn_bits;

s = dev->subdevices + 3;
s = &dev->subdevices[3];
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = PCI9111_DO_CHANNEL_NBR;
Expand Down

0 comments on commit e2f0880

Please sign in to comment.