Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324857
b: refs/heads/master
c: 9da5ae2
h: refs/heads/master
i:
  324855: bf0aaf1
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Sep 6, 2012
1 parent 6ad9966 commit af5c2f6
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: 379585ab5cedda27bb919457acc2441a384353d0
refs/heads/master: 9da5ae29cd92beb8dda6da2ee149ebb593fba7ab
10 changes: 5 additions & 5 deletions trunk/drivers/staging/comedi/drivers/comedi_parport.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ static irqreturn_t parport_interrupt(int irq, void *d)
{
struct comedi_device *dev = d;
struct parport_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->subdevices + 3;
struct comedi_subdevice *s = &dev->subdevices[3];

if (!devpriv->enable_irq)
return IRQ_NONE;
Expand Down Expand Up @@ -327,7 +327,7 @@ static int parport_attach(struct comedi_device *dev,
return ret;
devpriv = dev->private;

s = dev->subdevices + 0;
s = &dev->subdevices[0];
s->type = COMEDI_SUBD_DIO;
s->subdev_flags = SDF_READABLE | SDF_WRITABLE;
s->n_chan = 8;
Expand All @@ -336,23 +336,23 @@ static int parport_attach(struct comedi_device *dev,
s->insn_bits = parport_insn_a;
s->insn_config = parport_insn_config_a;

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

s = dev->subdevices + 2;
s = &dev->subdevices[2];
s->type = COMEDI_SUBD_DO;
s->subdev_flags = SDF_WRITABLE;
s->n_chan = 4;
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_bits = parport_insn_c;

s = dev->subdevices + 3;
s = &dev->subdevices[3];
if (irq) {
dev->read_subdev = s;
s->type = COMEDI_SUBD_DI;
Expand Down

0 comments on commit af5c2f6

Please sign in to comment.