Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 364008
b: refs/heads/master
c: ee35269
h: refs/heads/master
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Apr 9, 2013
1 parent e91c5f4 commit 99bc209
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 0682323c520cd05bac2df6117b01263df759b7b7
refs/heads/master: ee3526966589b77edba46659ecaec269f67d7216
8 changes: 4 additions & 4 deletions trunk/drivers/staging/comedi/drivers/rti800.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ static int rti800_ai_insn_read(struct comedi_device *dev,
struct comedi_insn *insn, unsigned int *data)
{
struct rti800_private *devpriv = dev->private;
unsigned int chan = CR_CHAN(insn->chanspec);
unsigned int gain = CR_RANGE(insn->chanspec);
int i, t;
int status;
int chan = CR_CHAN(insn->chanspec);
unsigned gain = CR_RANGE(insn->chanspec);
unsigned muxgain_bits;

inb(dev->iobase + RTI800_ADCHI);
Expand Down Expand Up @@ -223,7 +223,7 @@ static int rti800_ao_insn_read(struct comedi_device *dev,
unsigned int *data)
{
struct rti800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
unsigned int chan = CR_CHAN(insn->chanspec);
int i;

for (i = 0; i < insn->n; i++)
Expand All @@ -238,7 +238,7 @@ static int rti800_ao_insn_write(struct comedi_device *dev,
unsigned int *data)
{
struct rti800_private *devpriv = dev->private;
int chan = CR_CHAN(insn->chanspec);
unsigned int chan = CR_CHAN(insn->chanspec);
int reg_lo = chan ? RTI800_DAC1LO : RTI800_DAC0LO;
int reg_hi = chan ? RTI800_DAC1HI : RTI800_DAC0HI;
int val = devpriv->ao_readback[chan];
Expand Down

0 comments on commit 99bc209

Please sign in to comment.