From edb436f7738aa0e38c5026bcdbf9e389be5284b5 Mon Sep 17 00:00:00 2001 From: Shinya Kuribayashi Date: Sun, 27 Jun 2010 22:52:01 +0900 Subject: [PATCH] --- yaml --- r: 204543 b: refs/heads/master c: f5c1ca77a3b2f9b424c4f39bd71143d0ac308924 h: refs/heads/master i: 204541: 5a3093d149250c560190efea320f5218f333a3c0 204539: c457570900e56727c59a3e2770fb04d35b0235d6 204535: 73596c00d840241e219b6be2e7b277bfc50ca0c7 204527: 2f06b950787d19c685d9d964518bf1f8cca5cb93 204511: 841de97ed91abc95cb1cde2ffe8745c14f65dd7a 204479: c4e60a0c7fb45ace3f7f24de4b7b1e8b4596ca21 204415: 69bc82101ad7d82ddaacc452cd95b599800963c2 204287: 90ad07384689ac5ffd52e259e653396552d6523d v: v3 --- [refs] | 2 +- trunk/arch/mips/loongson/common/irq.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 53dd738c952d..3e3080ec9b0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f1f4e7dbc0c0312e9e7fe3cadd07340ea62070f +refs/heads/master: f5c1ca77a3b2f9b424c4f39bd71143d0ac308924 diff --git a/trunk/arch/mips/loongson/common/irq.c b/trunk/arch/mips/loongson/common/irq.c index 20e732831978..25a11df03482 100644 --- a/trunk/arch/mips/loongson/common/irq.c +++ b/trunk/arch/mips/loongson/common/irq.c @@ -21,19 +21,16 @@ void bonito_irqdispatch(void) /* workaround the IO dma problem: let cpu looping to allow DMA finish */ int_status = LOONGSON_INTISR; - if (int_status & (1 << 10)) { - while (int_status & (1 << 10)) { - udelay(1); - int_status = LOONGSON_INTISR; - } + while (int_status & (1 << 10)) { + udelay(1); + int_status = LOONGSON_INTISR; } /* Get pending sources, masked by current enables */ int_status = LOONGSON_INTISR & LOONGSON_INTEN; - if (int_status != 0) { + if (int_status) { i = __ffs(int_status); - int_status &= ~(1 << i); do_IRQ(LOONGSON_IRQ_BASE + i); } }