---

yaml --- r: 358488 b: refs/heads/master c: 944ea4d h: refs/heads/master v: v3
git-mirror · Jan 8, 2013 · 5b3bed6 · 5b3bed6
1 parent 088ebd3
commit 5b3bed6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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,