---

yaml --- r: 358495 b: refs/heads/master c: 2cbe7fe h: refs/heads/master i: 358493: 1da05e9 358491: e8836f0 358487: 088ebd3 358479: 8d9376f 358463: b2d6f93 v: v3
git-mirror · Jan 8, 2013 · fca891a · fca891a
1 parent 4a96aa4
commit fca891a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 }