From d591d77236a377a39c5c3f578d0717c08ffae565 Mon Sep 17 00:00:00 2001 From: Alexander Sverdlin Date: Thu, 11 Apr 2013 17:29:39 +0200 Subject: [PATCH] --- yaml --- r: 375136 b: refs/heads/master c: d41d547a419ca2d4df867a40a553abfe0c3df1d6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/cavium-octeon/octeon-irq.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 041b135e729b..e5e470e6919e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f560fabdf3f3fe12bd48146a6ccdf03ddf9ab12c +refs/heads/master: d41d547a419ca2d4df867a40a553abfe0c3df1d6 diff --git a/trunk/arch/mips/cavium-octeon/octeon-irq.c b/trunk/arch/mips/cavium-octeon/octeon-irq.c index 156aa6143e11..a22f06a6f7ca 100644 --- a/trunk/arch/mips/cavium-octeon/octeon-irq.c +++ b/trunk/arch/mips/cavium-octeon/octeon-irq.c @@ -1032,9 +1032,8 @@ static int octeon_irq_gpio_map_common(struct irq_domain *d, if (!octeon_irq_virq_in_range(virq)) return -EINVAL; - hw += gpiod->base_hwirq; - line = hw >> 6; - bit = hw & 63; + line = (hw + gpiod->base_hwirq) >> 6; + bit = (hw + gpiod->base_hwirq) & 63; if (line > line_limit || octeon_irq_ciu_to_irq[line][bit] != 0) return -EINVAL;