From 99bc20906e420c37fb0c59f90adf18565ab3a37b Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Mon, 8 Apr 2013 18:19:41 -0700 Subject: [PATCH] --- yaml --- r: 364008 b: refs/heads/master c: ee3526966589b77edba46659ecaec269f67d7216 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/rti800.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cad4d2fea73a..0555658a17e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0682323c520cd05bac2df6117b01263df759b7b7 +refs/heads/master: ee3526966589b77edba46659ecaec269f67d7216 diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c index 04ba9e69b00a..30d7245b6bae 100644 --- a/trunk/drivers/staging/comedi/drivers/rti800.c +++ b/trunk/drivers/staging/comedi/drivers/rti800.c @@ -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); @@ -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++) @@ -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];