Skip to contentSkip to conversation

patch "staging: comedi: dmm32at: Fix endian problem for AI command data" added to staging-linus

PATCH [email protected] 1 participant 1 message Mar 3, 2021

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

staging: comedi: dmm32at: Fix endian problem for AI command data

to my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

From b301bdc8c156ddc8e8c491e7a0e2bd92b43e9510 Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Tue, 23 Feb 2021 14:30:47 +0000
Subject: staging: comedi: dmm32at: Fix endian problem for AI command data

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.

[Note: the bug was introduced in commit 1700529b24cc ("staging: comedi:
dmm32at: use comedi_buf_write_samples()") but the patch applies better to the later (but in the same kernel release) commit 0c0eadadcbe6e ("staging: comedi: dmm32at: introduce dmm32_ai_get_sample()").]

Fixes 0c0eadadcbe6e ("staging: comedi: dmm32at: introduce dmm32_ai_get_sample()")
Cc <[email protected]> # 3.19+
---
 drivers/staging/comedi/drivers/dmm32at.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/dmm32at.c +1 -1
index 17e6018918bb..56682f01242f 100644
@@ -404,7 +404,7 @@ static irqreturn_t dmm32at_isr(int irq, void *d)
 {
 	struct comedi_device *dev = d;
 	unsigned char intstat;
-	unsigned int val;
+	unsigned short val;
 	int i;
 
 	if (!dev->attached) {
Signature · 1 line
2.30.1