Skip to content

Commit

Permalink
staging: comedi: ni_labpc: fix labpc_eeprom_insn_write()
Browse files Browse the repository at this point in the history
The comedi core expects the (*insn_write) operations to write insn->n
values and return the number of values actually wrote.

Make this function work like the core expects.

As Ian Abbott pointed out, we really only need to write the last value
to the eeprom. The preceding data would be overwritten anyway.

Also, remove the noise about invalid channels.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
H Hartley Sweeten authored and Greg Kroah-Hartman committed Mar 26, 2013
1 parent e1970fc commit e7a1aa6
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions drivers/staging/comedi/drivers/ni_labpc.c
Original file line number Diff line number Diff line change
Expand Up @@ -1568,21 +1568,24 @@ static int labpc_eeprom_insn_write(struct comedi_device *dev,
struct comedi_insn *insn,
unsigned int *data)
{
int channel = CR_CHAN(insn->chanspec);
unsigned int chan = CR_CHAN(insn->chanspec);
int ret;

/* only allow writes to user area of eeprom */
if (channel < 16 || channel > 127) {
dev_dbg(dev->class_dev,
"eeprom writes are only allowed to channels 16 through 127 (the pointer and user areas)\n");
/* only allow writes to user area of eeprom */
if (chan < 16 || chan > 127)
return -EINVAL;
}

ret = labpc_eeprom_write(dev, channel, data[0]);
if (ret < 0)
return ret;
/*
* Only write the last data value to the eeprom. Preceding
* data would be overwritten anyway.
*/
if (insn->n > 0) {
ret = labpc_eeprom_write(dev, chan, data[insn->n - 1]);
if (ret)
return ret;
}

return 1;
return insn->n;
}

static int labpc_eeprom_insn_read(struct comedi_device *dev,
Expand Down

0 comments on commit e7a1aa6

Please sign in to comment.