Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 337617
b: refs/heads/master
c: 0bb482e
h: refs/heads/master
i:
  337615: 5d3b7a6
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Nov 2, 2012
1 parent 5e4905f commit be70f8f
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 2e8fcd182002b37378caea900296026577aced03
refs/heads/master: 0bb482e25c6c4e5084a0e0847307736bf090adec
7 changes: 2 additions & 5 deletions trunk/drivers/staging/comedi/drivers/addi_apci_3120.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ static const struct addi_board apci3120_boardtypes[] = {
.i_NbrAoChannel = 8,
.i_AiMaxdata = 0xffff,
.i_AoMaxdata = 0x3fff,
.pr_AoRangelist = &range_apci3120_ao,
.i_NbrDiChannel = 4,
.i_NbrDoChannel = 4,
.i_DoMaxdata = 0x0f,
.interrupt = v_APCI3120_Interrupt,
.ao_write = i_APCI3120_InsnWriteAnalogOutput,
}, {
.pc_DriverName = "apci3001",
.i_VendorId = PCI_VENDOR_ID_ADDIDATA_OLD,
Expand Down Expand Up @@ -172,9 +170,8 @@ static int apci3120_attach_pci(struct comedi_device *dev,
s->n_chan = this_board->i_NbrAoChannel;
s->maxdata = this_board->i_AoMaxdata;
s->len_chanlist = this_board->i_NbrAoChannel;
s->range_table = this_board->pr_AoRangelist;
s->insn_config = this_board->ao_config;
s->insn_write = this_board->ao_write;
s->range_table = &range_apci3120_ao;
s->insn_write = i_APCI3120_InsnWriteAnalogOutput;
} else {
s->type = COMEDI_SUBD_UNUSED;
}
Expand Down

0 comments on commit be70f8f

Please sign in to comment.