Commit 233f3510 authored Mar 22, 2016 by H Hartley Sweeten Committed by Sasha Levin Apr 18, 2016

staging: comedi: ni_mio_common: fix the ni_write[blw]() functions



[ Upstream commit bd3a3cd6c27b117fb9a43a38c8072c95332beecc ]

Memory mapped io (dev->mmio) should not also be writing to the ioport
(dev->iobase) registers. Add the missing 'else' to these functions.

Fixes: 0953ee4a ("staging: comedi: ni_mio_common: checkpatch.pl cleanup (else not useful)")
Cc: <stable@vger.kernel.org> # 3.17+
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 4e3bad33

drivers/staging/comedi/drivers/ni_mio_common.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ static void ni_writel(struct comedi_device *dev, uint32_t data, int reg)
		{
		if (dev->mmio)
		writel(data, dev->mmio + reg);

		else
		outl(data, dev->iobase + reg);
		}

		@@ -256,7 +256,7 @@ static void ni_writew(struct comedi_device *dev, uint16_t data, int reg)
		{
		if (dev->mmio)
		writew(data, dev->mmio + reg);

		else
		outw(data, dev->iobase + reg);
		}

		@@ -264,7 +264,7 @@ static void ni_writeb(struct comedi_device *dev, uint8_t data, int reg)
		{
		if (dev->mmio)
		writeb(data, dev->mmio + reg);

		else
		outb(data, dev->iobase + reg);
		}