Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 65fdfedb authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: pcl816: introduce pcl816_isadma_disable() 



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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d77bf973

drivers/staging/comedi/drivers/pcl816.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -147,6 +147,15 @@ static void pcl816_isadma_program(unsigned int dma_chan, 
	release_dma_lock(flags);

	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)

static void pcl816_start_pacer(struct comedi_device *dev, bool load_counters)

{

{

	struct pcl816_private *devpriv = dev->private;

	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 comedi_cmd *cmd = &s->async->cmd;

	struct pcl816_dma_desc *dma;

	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) {

	if (devpriv->dma_runs_to_end > -1 || cmd->stop_src == TRIG_NONE) {

		/* switch dma bufs */

		/* switch dma bufs */

		devpriv->cur_dma = 1 - devpriv->cur_dma;

		devpriv->cur_dma = 1 - devpriv->cur_dma;