summaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/drivers/ni_pcidio.c
diff options
context:
space:
mode:
authorH Hartley Sweeten <hsweeten@visionengravers.com>2016-04-21 12:04:44 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-28 22:19:49 -0700
commitf7d005c33c109ef034c9480334d3d25d91aa2d6d (patch)
treef9e0c28cf63ecb090e0900dc1daf2320883ad1fb /drivers/staging/comedi/drivers/ni_pcidio.c
parent3da088cae2a5f2ae6e8192db4b6e36496fd81514 (diff)
staging: comedi: mite: make mite_ack_linkc() handle mite_sync_dma()
The mite dma is always synced on a LINKC status. Some of the mite users sync the dma regadless of the status. Add a 'sync' parameter to mite_ack_linkc() to force a dma sync. Then do the dma sync as needed. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_pcidio.c')
-rw-r--r--drivers/staging/comedi/drivers/ni_pcidio.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/comedi/drivers/ni_pcidio.c b/drivers/staging/comedi/drivers/ni_pcidio.c
index b4c6bab57a26..4a34da5140e0 100644
--- a/drivers/staging/comedi/drivers/ni_pcidio.c
+++ b/drivers/staging/comedi/drivers/ni_pcidio.c
@@ -400,13 +400,8 @@ static irqreturn_t nidio_interrupt(int irq, void *d)
spin_lock(&devpriv->mite_channel_lock);
if (devpriv->di_mite_chan) {
- unsigned int m_status = mite_ack_linkc(devpriv->di_mite_chan,
- s);
-
- if (m_status & CHSR_LINKC) {
- mite_sync_dma(devpriv->di_mite_chan, s);
- /* XXX need to byteswap */
- }
+ mite_ack_linkc(devpriv->di_mite_chan, s, false);
+ /* XXX need to byteswap sync'ed dma */
}
spin_unlock(&devpriv->mite_channel_lock);