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

Commit 3e86f515 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice 



[ Upstream commit e083926b3e269d4064825dcf2ad50c636fddf8cf ]

The PFI subdevice flags indicate that the subdevice is readable and
writeable, but that is only true for the supported "M-series" boards,
not the older "E-series" boards.  Only set the SDF_READABLE and
SDF_WRITABLE subdevice flags for the M-series boards.  These two flags
are mainly for informational purposes.

Signed-off-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 120130a7

drivers/staging/comedi/drivers/ni_mio_common.c

+2 −1
Original line number Diff line number Diff line
@@ -5453,11 +5453,11 @@ static int ni_E_init(struct comedi_device *dev, 
	/* Digital I/O (PFI) subdevice */

	s = &dev->subdevices[NI_PFI_DIO_SUBDEV];

	s->type		= COMEDI_SUBD_DIO;

	s->subdev_flags	= SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;

	s->maxdata	= 1;

	if (devpriv->is_m_series) {

		s->n_chan	= 16;

		s->insn_bits	= ni_pfi_insn_bits;

		s->subdev_flags	= SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL;



		ni_writew(dev, s->state, NI_M_PFI_DO_REG);

		for (i = 0; i < NUM_PFI_OUTPUT_SELECT_REGS; ++i) {
@@ -5466,6 +5466,7 @@ static int ni_E_init(struct comedi_device *dev, 
		}

	} else {

		s->n_chan	= 10;

		s->subdev_flags	= SDF_INTERNAL;

	}

	s->insn_config	= ni_pfi_insn_config;