aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2016-03-22 13:04:48 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-22 22:22:13 -0400
commitbd3a3cd6c27b117fb9a43a38c8072c95332beecc (patch)
tree1010ee2de51f0b55bd7acef80a7dc22afbf70081
parent982177677a835c7084f50206769bf58906d87d76 (diff)
staging: comedi: ni_mio_common: fix the ni_write[blw]() functions
Memory mapped io (dev->mmio) should not also be writing to the ioport (dev->iobase) registers. Add the missing 'else' to these functions. Fixes: 0953ee4acca0 ("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>
-rw-r--r--drivers/staging/comedi/drivers/ni_mio_common.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/ni_mio_common.c b/drivers/staging/comedi/drivers/ni_mio_common.c
index d1226c97664b..dcaf7e89f299 100644
--- a/drivers/staging/comedi/drivers/ni_mio_common.c
+++ b/drivers/staging/comedi/drivers/ni_mio_common.c
@@ -246,24 +246,24 @@ static void ni_writel(struct comedi_device *dev, uint32_t data, int reg)
246{ 246{
247 if (dev->mmio) 247 if (dev->mmio)
248 writel(data, dev->mmio + reg); 248 writel(data, dev->mmio + reg);
249 249 else
250 outl(data, dev->iobase + reg); 250 outl(data, dev->iobase + reg);
251} 251}
252 252
253static void ni_writew(struct comedi_device *dev, uint16_t data, int reg) 253static void ni_writew(struct comedi_device *dev, uint16_t data, int reg)
254{ 254{
255 if (dev->mmio) 255 if (dev->mmio)
256 writew(data, dev->mmio + reg); 256 writew(data, dev->mmio + reg);
257 257 else
258 outw(data, dev->iobase + reg); 258 outw(data, dev->iobase + reg);
259} 259}
260 260
261static void ni_writeb(struct comedi_device *dev, uint8_t data, int reg) 261static void ni_writeb(struct comedi_device *dev, uint8_t data, int reg)
262{ 262{
263 if (dev->mmio) 263 if (dev->mmio)
264 writeb(data, dev->mmio + reg); 264 writeb(data, dev->mmio + reg);
265 265 else
266 outb(data, dev->iobase + reg); 266 outb(data, dev->iobase + reg);
267} 267}
268 268
269static uint32_t ni_readl(struct comedi_device *dev, int reg) 269static uint32_t ni_readl(struct comedi_device *dev, int reg)