From fca891a4b47e5fe2a8940687f581a684cb2952de Mon Sep 17 00:00:00 2001
From: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Date: Thu, 8 Nov 2012 10:02:07 +0000
Subject: [PATCH] --- yaml --- r: 358495 b: refs/heads/master c:
 2cbe7feba1ac521b5668609c35b94536bbbcd52f h: refs/heads/master i:   358493:
 1da05e91ce00284e9d88ea1252a664be43eff715   358491:
 e8836f04946036cfa5cf6718b4e72e4749fc4b5e   358487:
 088ebd3e2d843ce0a54a8dff4cff55bb03531990   358479:
 8d9376fabc1f7ccbc0dcf35ff966689ba2047a29   358463:
 b2d6f93cb1640e604f0af8e1b292170ec9604a65 v: v3

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

diff --git a/[refs] b/[refs]
index ae93def5d632..8963af09be40 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e239345f642e6a255d0ba1e3d92c2f9ec5a44fbe
+refs/heads/master: 2cbe7feba1ac521b5668609c35b94536bbbcd52f
diff --git a/trunk/drivers/dma/dmaengine.c b/trunk/drivers/dma/dmaengine.c
index d37cf95987b6..242b8c0a3de8 100644
--- a/trunk/drivers/dma/dmaengine.c
+++ b/trunk/drivers/dma/dmaengine.c
@@ -267,7 +267,10 @@ enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie)
 			pr_err("%s: timeout!\n", __func__);
 			return DMA_ERROR;
 		}
-	} while (status == DMA_IN_PROGRESS);
+		if (status != DMA_IN_PROGRESS)
+			break;
+		cpu_relax();
+	} while (1);
 
 	return status;
 }