patch "staging: comedi: addi_apci_1500: Fix endian problem for command" added to staging-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
staging: comedi: addi_apci_1500: Fix endian problem for command
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 a7638de0988fc5025c6738f5d45180c393d21e33 Mon Sep 17 00:00:00 2001
From: Ian Abbott <[email protected]>
Date: Tue, 23 Feb 2021 14:30:43 +0000
Subject: staging: comedi: addi_apci_1500: Fix endian problem for command
sample
The digital input subdevice supports Comedi asynchronous commands that read interrupt status information. This uses 16-bit Comedi samples (of which only the bottom 8 bits contain status information). However, the interrupt handler is calling comedi_buf_write_samples() with the address of a 32-bit variable unsigned int status. On a bigendian machine, this will copy 2 bytes from the wrong end of the variable. Fix it by changing the type of the variable to unsigned short.
--- .../staging/comedi/drivers/addi_apci_1500.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/staging/comedi/drivers/addi_apci_1500.c +9 -9
@@ -208,7 +208,7 @@ static irqreturn_t apci1500_interrupt(int irq, void *d)struct comedi_device *dev = d;struct apci1500_private *devpriv = dev->private;struct comedi_subdevice *s = dev->read_subdev; -unsigned int status =0 ; +unsigned short status =0 ;unsigned int val; val =inl (devpriv->amcc +AMCC_OP_REG_INTCSR );
@@ -238,14 +238,14 @@ static irqreturn_t apci1500_interrupt(int irq, void *d)* * Mask Meaning * ---------- ------------------------------------------ -* 0x00000001 Event 1 has occurred -* 0x00000010 Event 2 has occurred -* 0x00000100 Counter/timer 1 has run down (not implemented) -* 0x00001000 Counter/timer 2 has run down (not implemented) -* 0x00010000 Counter 3 has run down (not implemented) -* 0x00100000 Watchdog has run down (not implemented) -* 0x01000000 Voltage error -* 0x10000000 Short-circuit error +* 0b00000001 Event 1 has occurred +* 0b00000010 Event 2 has occurred +* 0b00000100 Counter/timer 1 has run down (not implemented) +* 0b00001000 Counter/timer 2 has run down (not implemented) +* 0b00010000 Counter 3 has run down (not implemented) +* 0b00100000 Watchdog has run down (not implemented) +* 0b01000000 Voltage error +* 0b10000000 Short-circuit error */ comedi_buf_write_samples (s, &status,1 );comedi_handle_events (dev, s);
Signature · 1 line
2.30.1