Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 363999
b: refs/heads/master
c: 14aa6cd
h: refs/heads/master
i:
  363997: 55897b8
  363995: ef52962
  363991: b0182b6
  363983: 162911b
  363967: d8f99b2
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent 0675d89 commit 7ada801
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 849d1ea4ae28e57557ad8901837d36aa2a760b5e
refs/heads/master: 14aa6cda07cae1b3f81254ea2b0167ba7bf7db6f
6 changes: 1 addition & 5 deletions trunk/drivers/staging/comedi/drivers/rti800.c
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,6 @@ static const struct rti800_board rti800_boardtypes[] = {
};

struct rti800_private {
enum {
adc_diff, adc_pseudodiff, adc_singleended
} adc_mux;
enum {
adc_bipolar10, adc_bipolar5, adc_unipolar10
} adc_range;
Expand Down Expand Up @@ -316,7 +313,6 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -ENOMEM;
dev->private = devpriv;

devpriv->adc_mux = it->options[2];
devpriv->adc_range = it->options[3];
devpriv->adc_coding = it->options[4];
devpriv->dac0_range = it->options[5];
Expand All @@ -333,7 +329,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it)
/* ai subdevice */
s->type = COMEDI_SUBD_AI;
s->subdev_flags = SDF_READABLE | SDF_GROUND;
s->n_chan = (devpriv->adc_mux ? 16 : 8);
s->n_chan = (it->options[2] ? 16 : 8);
s->insn_read = rti800_ai_insn_read;
s->maxdata = 0xfff;
switch (devpriv->adc_range) {
Expand Down

0 comments on commit 7ada801

Please sign in to comment.