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

Commit 2856fcdc authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/dma_control_cleanup_acks' into for-linus

parents 639559ad a500789d

drivers/ata/pata_arasan_cf.c

+2 −3
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ dma_xfer(struct arasan_cf_dev *acdev, dma_addr_t src, dma_addr_t dest, u32 len) 


	/* Wait for DMA to complete */

	if (!wait_for_completion_timeout(&acdev->dma_completion, TIMEOUT)) {

		chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);

		dmaengine_terminate_all(chan);

		dev_err(acdev->host->dev, "wait_for_completion_timeout\n");

		return -ETIMEDOUT;

	}
@@ -928,8 +928,7 @@ static int arasan_cf_suspend(struct device *dev) 
	struct arasan_cf_dev *acdev = host->ports[0]->private_data;



	if (acdev->dma_chan)

		acdev->dma_chan->device->device_control(acdev->dma_chan,

				DMA_TERMINATE_ALL, 0);

		dmaengine_terminate_all(acdev->dma_chan);



	cf_exit(acdev);

	return ata_host_suspend(host, PMSG_SUSPEND);

drivers/dma/coh901318.c

+1 −1
Original line number Diff line number Diff line
@@ -2156,7 +2156,7 @@ coh901318_free_chan_resources(struct dma_chan *chan) 


	spin_unlock_irqrestore(&cohc->lock, flags);



	chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);

	dmaengine_terminate_all(chan);

}

drivers/media/platform/soc_camera/mx3_camera.c

+2 −4
Original line number Diff line number Diff line
@@ -415,10 +415,8 @@ static void mx3_stop_streaming(struct vb2_queue *q) 
	struct mx3_camera_buffer *buf, *tmp;

	unsigned long flags;



	if (ichan) {

		struct dma_chan *chan = &ichan->dma_chan;

		chan->device->device_control(chan, DMA_PAUSE, 0);

	}

	if (ichan)

		dmaengine_pause(&ichan->dma_chan);



	spin_lock_irqsave(&mx3_cam->lock, flags);

drivers/mtd/nand/fsmc_nand.c

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ static int dma_xfer(struct fsmc_nand_data *host, void *buffer, int len, 
	wait_for_completion_timeout(&host->dma_access_complete,

				msecs_to_jiffies(3000));

	if (ret <= 0) {

		chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);

		dmaengine_terminate_all(chan);

		dev_err(host->dev, "wait_for_completion_timeout\n");

		if (!ret)

			ret = -ETIMEDOUT;

drivers/mtd/nand/sh_flctl.c

+1 −1
Original line number Diff line number Diff line
@@ -395,7 +395,7 @@ static int flctl_dma_fifo0_transfer(struct sh_flctl *flctl, unsigned long *buf, 
				msecs_to_jiffies(3000));



	if (ret <= 0) {

		chan->device->device_control(chan, DMA_TERMINATE_ALL, 0);

		dmaengine_terminate_all(chan);

		dev_err(&flctl->pdev->dev, "wait_for_completion_timeout\n");

	}