Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218774
b: refs/heads/master
c: 1b00348
h: refs/heads/master
v: v3
  • Loading branch information
Jonas Aaberg authored and Dan Williams committed Sep 22, 2010
1 parent 8d51826 commit f042fac
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 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: be8cb7dfd92420b12dfd6831c2d638f4f46bdfdf
refs/heads/master: 1b00348d5d0b3423fe21f499bf30d40a4d1dc594
5 changes: 1 addition & 4 deletions trunk/drivers/dma/ste_dma40.c
Original file line number Diff line number Diff line change
Expand Up @@ -915,7 +915,6 @@ static irqreturn_t d40_handle_interrupt(int irq, void *data)

int i;
u32 regs[ARRAY_SIZE(il)];
u32 tmp;
u32 idx;
u32 row;
long chan = -1;
Expand All @@ -942,9 +941,7 @@ static irqreturn_t d40_handle_interrupt(int irq, void *data)
idx = chan & (BITS_PER_LONG - 1);

/* ACK interrupt */
tmp = readl(base->virtbase + il[row].clr);
tmp |= 1 << idx;
writel(tmp, base->virtbase + il[row].clr);
writel(1 << idx, base->virtbase + il[row].clr);

if (il[row].offset == D40_PHY_CHAN)
d40c = base->lookup_phy_chans[idx];
Expand Down

0 comments on commit f042fac

Please sign in to comment.