summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott <abbotti@mev.co.uk>2021-02-23 14:30:46 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-03-17 16:43:50 +0100
commit33859dbeb97a9ab63a3ba5e881df60be69323a72 (patch)
tree7b8fcacf52ee2878d714c55a619b031244f4891e
parentd079c097128d3d1bd0c6925a2be3207547d013aa (diff)
downloadlinux-stable-33859dbeb97a9ab63a3ba5e881df60be69323a72.tar.gz
linux-stable-33859dbeb97a9ab63a3ba5e881df60be69323a72.tar.bz2
linux-stable-33859dbeb97a9ab63a3ba5e881df60be69323a72.zip
staging: comedi: das800: Fix endian problem for AI command data
commit 459b1e8c8fe97fcba0bd1b623471713dce2c5eaf upstream. The analog input subdevice supports Comedi asynchronous commands that use Comedi's 16-bit sample format. However, the call to `comedi_buf_write_samples()` is passing the address of a 32-bit integer variable. On bigendian machines, this will copy 2 bytes from the wrong end of the 32-bit value. Fix it by changing the type of the variable holding the sample value to `unsigned short`. Fixes: ad9eb43c93d8 ("staging: comedi: das800: use comedi_buf_write_samples()") Cc: <stable@vger.kernel.org> # 3.19+ Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Link: https://lore.kernel.org/r/20210223143055.257402-6-abbotti@mev.co.uk Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/das800.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/comedi/drivers/das800.c b/drivers/staging/comedi/drivers/das800.c
index 8cf09ef3012f..4bd8fd5218c8 100644
--- a/drivers/staging/comedi/drivers/das800.c
+++ b/drivers/staging/comedi/drivers/das800.c
@@ -427,7 +427,7 @@ static irqreturn_t das800_interrupt(int irq, void *d)
struct comedi_cmd *cmd;
unsigned long irq_flags;
unsigned int status;
- unsigned int val;
+ unsigned short val;
bool fifo_empty;
bool fifo_overflow;
int i;