Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324863
b: refs/heads/master
c: 9b7beb6
h: refs/heads/master
i:
  324861: 86e0529
  324859: ed95fa6
  324855: bf0aaf1
  324847: 2c44669
  324831: 07e7c27
  324799: d3a6042
  324735: 970dc65
  324607: 3e275cd
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent f6ec6e4 commit 14aac42
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 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: 35d10629f19570cd0d9e7b4485f027f300a12d33
refs/heads/master: 9b7beb661377e4bc8e6fdd02342d94caf51491cd
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/das16m1.c
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ static int das16m1_attach(struct comedi_device *dev,
if (ret)
return ret;

s = dev->subdevices + 0;
s = &dev->subdevices[0];
dev->read_subdev = s;
/* ai */
s->type = COMEDI_SUBD_AI;
Expand All @@ -666,7 +666,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->cancel = das16m1_cancel;
s->poll = das16m1_poll;

s = dev->subdevices + 1;
s = &dev->subdevices[1];
/* di */
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE;
Expand All @@ -675,7 +675,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->range_table = &range_digital;
s->insn_bits = das16m1_di_rbits;

s = dev->subdevices + 2;
s = &dev->subdevices[2];
/* do */
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE | SDF_READABLE;
Expand All @@ -684,7 +684,7 @@ static int das16m1_attach(struct comedi_device *dev,
s->range_table = &range_digital;
s->insn_bits = das16m1_do_wbits;

s = dev->subdevices + 3;
s = &dev->subdevices[3];
/* 8255 */
subdev_8255_init(dev, s, NULL, dev->iobase + DAS16M1_82C55);

Expand All @@ -707,7 +707,7 @@ static int das16m1_attach(struct comedi_device *dev,
static void das16m1_detach(struct comedi_device *dev)
{
if (dev->subdevices)
subdev_8255_cleanup(dev, dev->subdevices + 3);
subdev_8255_cleanup(dev, &dev->subdevices[3]);
if (dev->irq)
free_irq(dev->irq, dev);
if (dev->iobase) {
Expand Down

0 comments on commit 14aac42

Please sign in to comment.