From f042faccf897abc569d26bb9fe55243dd3fe4aae Mon Sep 17 00:00:00 2001 From: Jonas Aaberg Date: Mon, 9 Aug 2010 12:07:54 +0000 Subject: [PATCH] --- yaml --- r: 218774 b: refs/heads/master c: 1b00348d5d0b3423fe21f499bf30d40a4d1dc594 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/dma/ste_dma40.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 6ff5bc2ecd1e..207ebd79f00a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: be8cb7dfd92420b12dfd6831c2d638f4f46bdfdf +refs/heads/master: 1b00348d5d0b3423fe21f499bf30d40a4d1dc594 diff --git a/trunk/drivers/dma/ste_dma40.c b/trunk/drivers/dma/ste_dma40.c index 8aff86594141..538c35d05a57 100644 --- a/trunk/drivers/dma/ste_dma40.c +++ b/trunk/drivers/dma/ste_dma40.c @@ -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; @@ -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];