mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-09 17:17:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: comedi_parport: fix parport_insn_config_a()

Browse Source 
This is the (*insn_config) function for a DIO subdevice. It should be
using the data[0] value as the "instruction" to perform on the subdevice.

Use the comedi_dio_insn_config() helper to properly handle instructions.

Also, rename the function to better describe it's use.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten
2013-08-30 11:45:25 -07:00
committed by Greg Kroah-Hartman
parent 4c9213374c
commit 9f2843d17e
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/staging/comedi/drivers/comedi_parport.c
View File

@@ -109,22 +109,25 @@ static int parport_data_reg_insn_bits(struct comedi_device *dev,
return insn->n;
}
static int parport_insn_config_a(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
static int parport_data_reg_insn_config(struct comedi_device *dev,
struct comedi_subdevice *s,
struct comedi_insn *insn,
unsigned int *data)
{
struct parport_private *devpriv = dev->private;
int ret;
if (data[0]) {
s->io_bits = 0xff;
ret = comedi_dio_insn_config(dev, s, insn, data, 0xff);
if (ret)
return ret;
if (s->io_bits)
devpriv->c_data &= ~PARPORT_CTRL_BIDIR_ENA;
} else {
s->io_bits = 0;
else
devpriv->c_data |= PARPORT_CTRL_BIDIR_ENA;
}
outb(devpriv->c_data, dev->iobase + PARPORT_CTRL_REG);
return 1;
return insn->n;
}
static int parport_insn_b(struct comedi_device *dev, struct comedi_subdevice *s,
@@ -288,7 +291,7 @@ static int parport_attach(struct comedi_device *dev,
s->maxdata = 1;
s->range_table = &range_digital;
s->insn_bits = parport_data_reg_insn_bits;
s->insn_config = parport_insn_config_a;
s->insn_config = parport_data_reg_insn_config;
s = &dev->subdevices[1];
s->type = COMEDI_SUBD_DI;