[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1408447956-10139-1-git-send-email-abbotti@mev.co.uk>
Date: Tue, 19 Aug 2014 12:32:36 +0100
From: Ian Abbott <abbotti@....co.uk>
To: driverdev-devel@...uxdriverproject.org
Cc: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Ian Abbott <abbotti@....co.uk>,
H Hartley Sweeten <hartleys@...ionengravers.com>,
linux-kernel@...r.kernel.org
Subject: [PATCH] staging: comedi: amplc_pci230: fix DACOUT write
Commit 4f9c63fe5333b27ab23ed399830c7977f6970744 ("staging: comedi:
amplc_pci230: refactor iobase addresses") removed some parentheses
(presumably to keep the line withing 80 chars) in
`pci230_ao_write_nofifo()` when writing to the DACOUT1 or DACOUT2
registers, but it removed the wrong parentheses. Fix it.
Signed-off-by: Ian Abbott <abbotti@....co.uk>
---
This bug is in linux-next master and staging-next.
---
drivers/staging/comedi/drivers/amplc_pci230.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pci230.c b/drivers/staging/comedi/drivers/amplc_pci230.c
index 0fd212f..dd69e47 100644
--- a/drivers/staging/comedi/drivers/amplc_pci230.c
+++ b/drivers/staging/comedi/drivers/amplc_pci230.c
@@ -628,7 +628,7 @@ static inline void pci230_ao_write_nofifo(struct comedi_device *dev,
/* Write mangled datum to appropriate DACOUT register. */
outw(pci230_ao_mangle_datum(dev, datum),
- devpriv->daqio + ((chan) == 0) ? PCI230_DACOUT1 : PCI230_DACOUT2);
+ devpriv->daqio + (chan == 0 ? PCI230_DACOUT1 : PCI230_DACOUT2));
}
static inline void pci230_ao_write_fifo(struct comedi_device *dev,
--
2.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists