From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sn1nam01on0097.outbound.protection.outlook.com ([104.47.32.97]:17609 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727725AbeH3WLL (ORCPT ); Thu, 30 Aug 2018 18:11:11 -0400 From: Sasha Levin To: "stable@vger.kernel.org" CC: Ian Abbott , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.18 084/113] staging: comedi: ni_mio_common: fix subdevice flags for PFI subdevice Date: Thu, 30 Aug 2018 18:07:48 +0000 Message-ID: <20180830180714.36167-18-alexander.levin@microsoft.com> References: <20180830180714.36167-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180714.36167-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Ian Abbott [ 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: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/staging/comedi/drivers/ni_mio_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/stagi= ng/comedi/drivers/ni_mio_common.c index e40a2c0a9543..d3da39a9f567 100644 --- a/drivers/staging/comedi/drivers/ni_mio_common.c +++ b/drivers/staging/comedi/drivers/ni_mio_common.c @@ -5446,11 +5446,11 @@ static int ni_E_init(struct comedi_device *dev, /* Digital I/O (PFI) subdevice */ s =3D &dev->subdevices[NI_PFI_DIO_SUBDEV]; s->type =3D COMEDI_SUBD_DIO; - s->subdev_flags =3D SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; s->maxdata =3D 1; if (devpriv->is_m_series) { s->n_chan =3D 16; s->insn_bits =3D ni_pfi_insn_bits; + s->subdev_flags =3D SDF_READABLE | SDF_WRITABLE | SDF_INTERNAL; =20 ni_writew(dev, s->state, NI_M_PFI_DO_REG); for (i =3D 0; i < NUM_PFI_OUTPUT_SELECT_REGS; ++i) { @@ -5459,6 +5459,7 @@ static int ni_E_init(struct comedi_device *dev, } } else { s->n_chan =3D 10; + s->subdev_flags =3D SDF_INTERNAL; } s->insn_config =3D ni_pfi_insn_config; =20 --=20 2.17.1