On Tuesday, February 24, 2015 9:13 PM, Nicholas Krause wrote: > This changes us using the incorrect error,-ETIMEOUT when checking if > the channel we are allocating to on the device structure pointer passed > to this function is greater then the maximum available channels for this > device to the correct error for a channel being out of range,-ECHRNG. > > Signed-off-by: Nicholas Krause <xerofoify@xxxxxxxxx> > --- > drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/staging/comedi/drivers/cb_pcimdas.c b/drivers/staging/comedi/drivers/cb_pcimdas.c > index 70dd2c9..d91a6f3 100644 > --- a/drivers/staging/comedi/drivers/cb_pcimdas.c > +++ b/drivers/staging/comedi/drivers/cb_pcimdas.c > @@ -121,7 +121,7 @@ static int cb_pcimdas_ai_rinsn(struct comedi_device *dev, > maxchans = s->n_chan; > > if (chan > (maxchans - 1)) > - return -ETIMEDOUT; /* *** Wrong error code. Fixme. */ > + return -ECHRNG; > > /* configure for sw initiated read */ > d = inb(devpriv->BADR3 + 5); Hmm... This isn't quite right... The 16 single-ended / 8 differential analog input channels on this board is set with a switch on the PCB. The state of the switch should be read when the driver is attached and the subdevice initialized with the correct number of channels. The core will then validate the "chan" number before calling the (*insn_read) operation. Regards, Hartley _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
