Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 317653
b: refs/heads/master
c: ac55ca3
h: refs/heads/master
i:
  317651: 5015244
v: v3
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Jul 6, 2012
1 parent 4f9a7b1 commit d1a296e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 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: b436356dcc67a665da07441ab113e9a5652073e5
refs/heads/master: ac55ca32ca40de3cb52a1ca73ca4a9250e07eefd
10 changes: 7 additions & 3 deletions trunk/drivers/staging/comedi/drivers/cb_pcidas.c
Original file line number Diff line number Diff line change
Expand Up @@ -659,7 +659,7 @@ static int caldac_read_insn(struct comedi_device *dev,
}

/* 1602/16 pregain offset */
static int dac08_write(struct comedi_device *dev, unsigned int value)
static void dac08_write(struct comedi_device *dev, unsigned int value)
{
struct cb_pcidas_private *devpriv = dev->private;
unsigned long cal_reg;
Expand All @@ -680,14 +680,18 @@ static int dac08_write(struct comedi_device *dev, unsigned int value)
outw(value, cal_reg);
udelay(1);
}
return 1; /* insn->n */
}

static int dac08_write_insn(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
return dac08_write(dev, data[0]);
int i;

for (i = 0; i < insn->n; i++)
dac08_write(dev, data[i]);

return insn->n;
}

static int dac08_read_insn(struct comedi_device *dev,
Expand Down

0 comments on commit d1a296e

Please sign in to comment.