Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324836
b: refs/heads/master
c: 5c60f86
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent ee60e3a commit b546d61
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 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: 4fe92e16060e24dcf84730307e925e3b1a4302cd
refs/heads/master: 5c60f867b1381f53e5d84a1c02a13b6f546cde0b
14 changes: 7 additions & 7 deletions trunk/drivers/staging/comedi/drivers/adv_pci1710.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ static void interrupt_pci1710_every_sample(void *d)
{
struct comedi_device *dev = d;
struct pci1710_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->subdevices + 0;
struct comedi_subdevice *s = &dev->subdevices[0];
int m;
#ifdef PCI171x_PARANOIDCHECK
const struct boardtype *this_board = comedi_board(dev);
Expand Down Expand Up @@ -873,7 +873,7 @@ static void interrupt_pci1710_half_fifo(void *d)
struct comedi_device *dev = d;
const struct boardtype *this_board = comedi_board(dev);
struct pci1710_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->subdevices + 0;
struct comedi_subdevice *s = &dev->subdevices[0];
int m, samplesinbuf;

m = inw(dev->iobase + PCI171x_STATUS);
Expand Down Expand Up @@ -1395,7 +1395,7 @@ static int pci1710_attach(struct comedi_device *dev,
subdev = 0;

if (this_board->n_aichan) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
dev->read_subdev = s;
s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_COMMON | SDF_GROUND;
Expand All @@ -1417,7 +1417,7 @@ static int pci1710_attach(struct comedi_device *dev,
}

if (this_board->n_aochan) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->n_aochan;
Expand All @@ -1437,7 +1437,7 @@ static int pci1710_attach(struct comedi_device *dev,
}

if (this_board->n_dichan) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->n_dichan;
Expand All @@ -1450,7 +1450,7 @@ static int pci1710_attach(struct comedi_device *dev,
}

if (this_board->n_dochan) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND | SDF_COMMON;
s->n_chan = this_board->n_dochan;
Expand All @@ -1465,7 +1465,7 @@ static int pci1710_attach(struct comedi_device *dev,
}

if (this_board->n_counter) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_COUNTER;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = this_board->n_counter;
Expand Down

0 comments on commit b546d61

Please sign in to comment.