admin/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2025-12-07 20:06:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: pcl816: introduce pcl816_isadma_disable()

Browse Source 
According to Documentation/DMA-ISA-LPC.txt, the DMA lock needs to be
claimed before using any of the ISA DMA routines. Introduce a helper
function to disable the ISA DMA controller and add the necessary
locking calls.

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>
This commit is contained in:
H Hartley Sweeten
2015-01-13 10:16:23 -07:00
committed by Greg Kroah-Hartman
parent d77bf9736b
commit 65fdfedbc0
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/comedi/drivers/pcl816.c
View File

@@ -147,6 +147,15 @@ static void pcl816_isadma_program(unsigned int dma_chan,
release_dma_lock(flags);
}
static void pcl816_isadma_disable(unsigned int dma_chan)
{
unsigned long flags;
flags = claim_dma_lock();
disable_dma(dma_chan);
release_dma_lock(flags);
}
static void pcl816_start_pacer(struct comedi_device *dev, bool load_counters)
{
struct pcl816_private *devpriv = dev->private;
@@ -202,7 +211,7 @@ static void pcl816_ai_setup_next_dma(struct comedi_device *dev,
struct comedi_cmd *cmd = &s->async->cmd;
struct pcl816_dma_desc *dma;
disable_dma(devpriv->dma);
pcl816_isadma_disable(devpriv->dma);
if (devpriv->dma_runs_to_end > -1 || cmd->stop_src == TRIG_NONE) {
/* switch dma bufs */
devpriv->cur_dma = 1 - devpriv->cur_dma;