Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c5bd90e authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: rti800: use comedi_timeout() 



Use comedi_timeout() to wait for the analog input end-of-conversion.

Change the errno returned for an overrun from -EIO to -EOVERFLOW.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8a62fcbd

drivers/staging/comedi/drivers/rti800.c

+13 −16
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ 


#define RTI800_IOSIZE		0x10



#define RTI800_AI_TIMEOUT	100



static const struct comedi_lrange range_rti800_ai_10_bipolar = {

	4, {

		BIP_RANGE(10),
@@ -145,23 +143,21 @@ struct rti800_private { 
	unsigned char muxgain_bits;

};



static int rti800_ai_wait_for_conversion(struct comedi_device *dev,

					 int timeout)

static int rti800_ai_eoc(struct comedi_device *dev,

			 struct comedi_subdevice *s,

			 struct comedi_insn *insn,

			 unsigned long context)

{

	unsigned char status;

	int i;



	for (i = 0; i < timeout; i++) {

	status = inb(dev->iobase + RTI800_CSR);

	if (status & RTI800_CSR_OVERRUN) {

		outb(0, dev->iobase + RTI800_CLRFLAGS);

			return -EIO;

		return -EOVERFLOW;

	}

	if (status & RTI800_CSR_DONE)

		return 0;

		udelay(1);

	}

	return -ETIME;

	return -EBUSY;

}



static int rti800_ai_insn_read(struct comedi_device *dev,
@@ -198,7 +194,8 @@ static int rti800_ai_insn_read(struct comedi_device *dev, 


	for (i = 0; i < insn->n; i++) {

		outb(0, dev->iobase + RTI800_CONVERT);

		ret = rti800_ai_wait_for_conversion(dev, RTI800_AI_TIMEOUT);



		ret = comedi_timeout(dev, s, insn, rti800_ai_eoc, 0);

		if (ret)

			return ret;