Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324908
b: refs/heads/master
c: 93a3795
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 2c564b5 commit c5ac447
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 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: dda841ff2ffe12f39309d970fbd1a550a7eda570
refs/heads/master: 93a37955bcc0ce1b261d4e9dc280a90e416ca9e1
12 changes: 6 additions & 6 deletions trunk/drivers/staging/comedi/drivers/pcl812.c
Original file line number Diff line number Diff line change
Expand Up @@ -806,7 +806,7 @@ static irqreturn_t interrupt_pcl812_ai_int(int irq, void *d)
char err = 1;
unsigned int mask, timeout;
struct comedi_device *dev = d;
struct comedi_subdevice *s = dev->subdevices + 0;
struct comedi_subdevice *s = &dev->subdevices[0];
unsigned int next_chan;

s->async->events = 0;
Expand Down Expand Up @@ -909,7 +909,7 @@ static void transfer_from_dma_buf(struct comedi_device *dev,
static irqreturn_t interrupt_pcl812_ai_dma(int irq, void *d)
{
struct comedi_device *dev = d;
struct comedi_subdevice *s = dev->subdevices + 0;
struct comedi_subdevice *s = &dev->subdevices[0];
unsigned long dma_flags;
int len, bufptr;
short *ptr;
Expand Down Expand Up @@ -1267,7 +1267,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* analog input */
if (board->n_aichan > 0) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE;
switch (board->board_type) {
Expand Down Expand Up @@ -1409,7 +1409,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* analog output */
if (board->n_aochan > 0) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_AO;
s->subdev_flags = SDF_WRITABLE | SDF_GROUND;
s->n_chan = board->n_aochan;
Expand Down Expand Up @@ -1438,7 +1438,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* digital input */
if (board->n_dichan > 0) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DI;
s->subdev_flags = SDF_READABLE;
s->n_chan = board->n_dichan;
Expand All @@ -1451,7 +1451,7 @@ static int pcl812_attach(struct comedi_device *dev, struct comedi_devconfig *it)

/* digital output */
if (board->n_dochan > 0) {
s = dev->subdevices + subdev;
s = &dev->subdevices[subdev];
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE;
s->n_chan = board->n_dochan;
Expand Down

0 comments on commit c5ac447

Please sign in to comment.