From 5b3bed630d6e18e50ed10b0d1819256f612c95e4 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Sun, 11 Nov 2012 23:03:20 +0000 Subject: [PATCH] --- yaml --- r: 358488 b: refs/heads/master c: 944ea4dd38b8575e30a5699633c81945bff1864d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/dmatest.c | 4 ++-- trunk/include/linux/dmaengine.h | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5077fffe912a..14e76c41b9a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e4d43c1764bc3ee1150f24e530db2b5b23e91425 +refs/heads/master: 944ea4dd38b8575e30a5699633c81945bff1864d diff --git a/trunk/drivers/dma/dmatest.c b/trunk/drivers/dma/dmatest.c index 3a8047b1f108..99a75e5d66be 100644 --- a/trunk/drivers/dma/dmatest.c +++ b/trunk/drivers/dma/dmatest.c @@ -536,7 +536,7 @@ static int dmatest_func(void *data) thread_name, total_tests, failed_tests, ret); /* terminate all transfers on specified channels */ - chan->device->device_control(chan, DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(chan); if (iterations > 0) while (!kthread_should_stop()) { DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait_dmatest_exit); @@ -561,7 +561,7 @@ static void dmatest_cleanup_channel(struct dmatest_chan *dtc) } /* terminate all transfers on specified channels */ - dtc->chan->device->device_control(dtc->chan, DMA_TERMINATE_ALL, 0); + dmaengine_terminate_all(dtc->chan); kfree(dtc); } diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 3aa76dbed166..be6e95395b11 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -608,7 +608,10 @@ static inline int dmaengine_device_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd, unsigned long arg) { - return chan->device->device_control(chan, cmd, arg); + if (chan->device->device_control) + return chan->device->device_control(chan, cmd, arg); + else + return -ENOSYS; } static inline int dmaengine_slave_config(struct dma_chan *chan,