Skip to contentSkip to conversation

patch "staging: comedi: ni_mio_common: fix wrong insn_write handler" added to staging-linus

PATCH [email protected] 1 participant 1 message Aug 21, 2016

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: ni_mio_common: fix wrong insn_write handler

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.

Quoted 1 line

From 5ca05345c56cb979e1a25ab6146437002f95cac8 Mon Sep 17 00:00:00 2001

From: Ian Abbott <[email protected]>
Date: Wed, 20 Jul 2016 17:07:34 +0100
Subject: staging: comedi: ni_mio_common: fix wrong insn_write handler
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For counter subdevices, the s->insn_write handler is being set to the wrong function, ni_tio_insn_read(). It should be ni_tio_insn_write().

Fixes 10f74377eec3 ("staging: comedi: ni_tio: make ni_tio_winsn() a

proper comedi (*insn_write)"

---
 drivers/staging/comedi/drivers/ni_mio_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/comedi/drivers/ni_mio_common.c +1 -1
index 8dabb19519a5..3cf3c05c5ef2 100644
@@ -5480,7 +5480,7 @@ static int ni_E_init(struct comedi_device *dev,
 		s->maxdata	= (devpriv->is_m_series) ? 0xffffffff
 							 : 0x00ffffff;
 		s->insn_read	= ni_tio_insn_read;
-		s->insn_write	= ni_tio_insn_read;
+		s->insn_write	= ni_tio_insn_write;
 		s->insn_config	= ni_tio_insn_config;
 #ifdef PCIDMA
 		if (dev->irq && devpriv->mite) {
Signature · 1 line
2.9.3