Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337889
b: refs/heads/master
c: 3f0732a
h: refs/heads/master
i:
  337887: 98f5c48
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 13, 2012
1 parent 4ee66e6 commit 820e0b9
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 07e957120d79f41463023c302274ba26c994d789
refs/heads/master: 3f0732a724d3d454a264a7ac2313313cf95a52bf
7 changes: 4 additions & 3 deletions trunk/drivers/staging/comedi/drivers/addi_apci_1516.c
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
if (ret)
return ret;

/* Allocate and Initialise DI Subdevice Structures */
/* Initialize the digital input subdevice */
s = &dev->subdevices[0];
if (this_board->di_nchan) {
s->type = COMEDI_SUBD_DI;
Expand All @@ -268,7 +268,8 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
} else {
s->type = COMEDI_SUBD_UNUSED;
}
/* Allocate and Initialise DO Subdevice Structures */

/* Initialize the digital output subdevice */
s = &dev->subdevices[1];
if (this_board->do_nchan) {
s->type = COMEDI_SUBD_DO;
Expand All @@ -281,7 +282,7 @@ static int __devinit apci1516_auto_attach(struct comedi_device *dev,
s->type = COMEDI_SUBD_UNUSED;
}

/* Allocate and Initialise Timer Subdevice Structures */
/* Initialize the watchdog subdevice */
s = &dev->subdevices[2];
if (this_board->has_wdog) {
s->type = COMEDI_SUBD_TIMER;
Expand Down

0 comments on commit 820e0b9

Please sign in to comment.