Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324887
b: refs/heads/master
c: f6e5602
h: refs/heads/master
i:
  324885: c26cdf7
  324883: 3fa8ca9
  324879: b9891e5
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 880bb10 commit b40bbc5
Show file tree
Hide file tree
Showing 2 changed files with 4 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: bc1acb209e77e698182bb167f49b5763211f4010
refs/heads/master: f6e5602710ca71fd7084dc923c6ed22892df20c7
6 changes: 3 additions & 3 deletions trunk/drivers/staging/comedi/drivers/me_daq.c
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
if (error)
return error;

s = dev->subdevices + 0;
s = &dev->subdevices[0];
s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_CMD_READ;
s->n_chan = board->ai_channel_nbr;
Expand All @@ -770,7 +770,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->do_cmdtest = me_ai_do_cmd_test;
s->do_cmd = me_ai_do_cmd;

s = dev->subdevices + 1;
s = &dev->subdevices[1];
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITEABLE | SDF_COMMON;
s->n_chan = board->ao_channel_nbr;
Expand All @@ -780,7 +780,7 @@ static int me_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->insn_read = me_ao_insn_read;
s->insn_write = me_ao_insn_write;

s = dev->subdevices + 2;
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITEABLE;
s->n_chan = board->dio_channel_nbr;
Expand Down

0 comments on commit b40bbc5

Please sign in to comment.