Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 186836
b: refs/heads/master
c: f1c54e8
h: refs/heads/master
v: v3
  • Loading branch information
Andrea Gelmini authored and Greg Kroah-Hartman committed Mar 4, 2010
1 parent 1df2693 commit 909405a
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 7c2f1946a5d41da3cfc1696944aaa420db5b5145
refs/heads/master: f1c54e82726fe51a55a18d15dc9377b8fd568ca2
8 changes: 3 additions & 5 deletions trunk/drivers/staging/comedi/drivers/cb_pcimdda.c
Original file line number Diff line number Diff line change
Expand Up @@ -284,11 +284,10 @@ static int attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->n_chan = thisboard->ao_chans;
s->maxdata = figure_out_maxdata(thisboard->ao_bits);
/* this is hard-coded here */
if (it->options[2]) {
if (it->options[2])
s->range_table = &range_bipolar10;
} else {
else
s->range_table = &range_bipolar5;
}
s->insn_write = &ao_winsn;
s->insn_read = &ao_rinsn;

Expand Down Expand Up @@ -337,9 +336,8 @@ static int detach(struct comedi_device *dev)
}

if (devpriv->pci_dev) {
if (devpriv->registers) {
if (devpriv->registers)
comedi_pci_disable(devpriv->pci_dev);
}
pci_dev_put(devpriv->pci_dev);
}

Expand Down

0 comments on commit 909405a

Please sign in to comment.