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

Commit 319b67ae authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_pcidio: sample types are unsigned 



Sample values in comedi are generally represented as unsigned values.
Change `nidio_interrupt()` to use unsigned types for sample values
(actually bit-vectors of 1-bit sample values) instead of signed types.

Also rename the `AuxData` variable to `auxdata` and change it from
`long` to `unsigned int` as it only needs to hold a 32-bit value.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3a2b101c

drivers/staging/comedi/drivers/ni_pcidio.c

+6 −6
Original line number Diff line number Diff line
@@ -406,9 +406,9 @@ static irqreturn_t nidio_interrupt(int irq, void *d) 
	struct mite_struct *mite = devpriv->mite;



	/* int i, j; */

	long int AuxData = 0;

	short data1 = 0;

	short data2 = 0;

	unsigned int auxdata = 0;

	unsigned short data1 = 0;

	unsigned short data2 = 0;

	int flags;

	int status;

	int work = 0;
@@ -481,11 +481,11 @@ static irqreturn_t nidio_interrupt(int irq, void *d) 
					      );

					goto out;

				}

				AuxData =

				auxdata =

				    readl(devpriv->mite->daq_io_addr +

					  Group_1_FIFO);

				data1 = AuxData & 0xffff;

				data2 = (AuxData & 0xffff0000) >> 16;

				data1 = auxdata & 0xffff;

				data2 = (auxdata & 0xffff0000) >> 16;

				comedi_buf_put(async, data1);

				comedi_buf_put(async, data2);

				/* DPRINTK("read:%d, %d\n",data1,data2); */