From 2bcedb37e84514ae3aa52cea49755dea99a2eb77 Mon Sep 17 00:00:00 2001
From: Russell King - ARM Linux <linux@arm.linux.org.uk>
Date: Mon, 3 Jan 2011 22:46:17 +0000
Subject: [PATCH] --- yaml --- r: 231612 b: refs/heads/master c:
 b7f758659265c173380b792862aaad1c23c0e004 h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/dma/amba-pl08x.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6d729a212d0c..d00bb4dda161 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0fd944625b6e406dc273b8dffa16e0728c973e6
+refs/heads/master: b7f758659265c173380b792862aaad1c23c0e004
diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c
index c7f7b82f6155..bebc678ed4fc 100644
--- a/trunk/drivers/dma/amba-pl08x.c
+++ b/trunk/drivers/dma/amba-pl08x.c
@@ -1129,6 +1129,9 @@ static int dma_set_runtime_config(struct dma_chan *chan,
 	u32 cctl = 0;
 	int i;
 
+	if (!plchan->slave)
+		return -EINVAL;
+
 	/* Transfer direction */
 	plchan->runtime_direction = config->direction;
 	if (config->direction == DMA_TO_DEVICE) {