From 44d0090f5213c7e202f7dd02bd70f5a80d9f095a Mon Sep 17 00:00:00 2001
From: Jonas Aaberg <jonas.aberg@stericsson.com>
Date: Mon, 9 Aug 2010 12:08:49 +0000
Subject: [PATCH] --- yaml --- r: 218781 b: refs/heads/master c:
 69f93faa57ed6c91b32aae1dcff7282fcb2872f5 h: refs/heads/master i:   218779:
 9ff1d49351dca1857094c0b6f5a71ef8eb34ff6d v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/dma/ste_dma40.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 80c50697476c..cd909371d6f2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9dbfbd35ce16e4f5a4d0d9e3f6e012b136fe80ea
+refs/heads/master: 69f93faa57ed6c91b32aae1dcff7282fcb2872f5
diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c
index 2b209fa004ba..ac325e918171 100644
--- a/trunk/drivers/dma/ste_dma40.c
+++ b/trunk/drivers/dma/ste_dma40.c
@@ -684,12 +684,12 @@ static void d40_config_write(struct d40_chan *d40c)
 
 static void d40_desc_load(struct d40_chan *d40c, struct d40_desc *d40d)
 {
-	if (d40d->lli_phy.dst && d40d->lli_phy.src) {
+	if (d40c->log_num == D40_PHY_CHAN) {
 		d40_phy_lli_write(d40c->base->virtbase,
 				  d40c->phy_chan->num,
 				  d40d->lli_phy.dst,
 				  d40d->lli_phy.src);
-	} else if (d40d->lli_log.dst && d40d->lli_log.src) {
+	} else {
 		struct d40_log_lli *src = d40d->lli_log.src;
 		struct d40_log_lli *dst = d40d->lli_log.dst;
 		int s;