Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 231583
b: refs/heads/master
c: 19386b3
h: refs/heads/master
i:
  231581: f90e696
  231579: 6267f6b
  231575: 5c069e8
  231567: 81b846f
  231551: 4a8433c
v: v3
  • Loading branch information
Russell King - ARM Linux authored and Dan Williams committed Jan 5, 2011
1 parent 5889ea3 commit 04d7443
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8c8cc2b1040f51a2f89724edbf976774128339eb
refs/heads/master: 19386b3234fdbe4d33492574d83e63a8dace18d3
6 changes: 3 additions & 3 deletions trunk/drivers/dma/amba-pl08x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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, "
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 04d7443

Please sign in to comment.