From 04d744347db36e13911f3294b7f237b4f34d59a8 Mon Sep 17 00:00:00 2001 From: Russell King - ARM Linux Date: Mon, 3 Jan 2011 22:36:29 +0000 Subject: [PATCH] --- yaml --- r: 231583 b: refs/heads/master c: 19386b3234fdbe4d33492574d83e63a8dace18d3 h: refs/heads/master i: 231581: f90e6965656e14c5892e884512c0588f0ee1dabc 231579: 6267f6b443fe1a6e54aedeaa6b1fb03964b6ce3b 231575: 5c069e82558a9f188111ed0f31577531843173bc 231567: 81b846f4ddc8159f0615b682f8ab9537c195dc35 231551: 4a8433c5a4adde247eb68c3a144bbc56eed98b1e v: v3 --- [refs] | 2 +- trunk/drivers/dma/amba-pl08x.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 1dc152834fbe..d6f6a8ae8080 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c8cc2b1040f51a2f89724edbf976774128339eb +refs/heads/master: 19386b3234fdbe4d33492574d83e63a8dace18d3 diff --git a/trunk/drivers/dma/amba-pl08x.c b/trunk/drivers/dma/amba-pl08x.c index e8967ff44fc2..78c84b3f903d 100644 --- a/trunk/drivers/dma/amba-pl08x.c +++ b/trunk/drivers/dma/amba-pl08x.c @@ -191,7 +191,7 @@ static void pl08x_set_cregs(struct pl08x_driver_data *pl08x, { /* Wait for channel inactive */ while (pl08x_phy_channel_busy(ch)) - ; + cpu_relax(); dev_vdbg(&pl08x->adev->dev, "WRITE channel %d: csrc=0x%08x, cdst=0x%08x, " @@ -255,7 +255,7 @@ static void pl08x_enable_phy_chan(struct pl08x_driver_data *pl08x, * Do not access config register until channel shows as disabled */ while (readl(pl08x->base + PL080_EN_CHAN) & (1 << ch->id)) - ; + cpu_relax(); /* * Do not access config register until channel shows as inactive @@ -288,7 +288,7 @@ static void pl08x_pause_phy_chan(struct pl08x_phy_chan *ch) /* Wait for channel inactive */ while (pl08x_phy_channel_busy(ch)) - ; + cpu_relax(); } static void pl08x_resume_phy_chan(struct pl08x_phy_chan *ch)