Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / drivers / mfd / stmpe.c

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index 1dd3948..58d09c6 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -1095,7 +1095,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)
 
        if (variant->id_val == STMPE801_ID ||
            variant->id_val == STMPE1600_ID) {
-               int base = irq_create_mapping(stmpe->domain, 0);
+               int base = irq_find_mapping(stmpe->domain, 0);
 
                handle_nested_irq(base);
                return IRQ_HANDLED;
@@ -1123,7 +1123,7 @@ static irqreturn_t stmpe_irq(int irq, void *data)
                while (status) {
                        int bit = __ffs(status);
                        int line = bank * 8 + bit;
-                       int nestedirq = irq_create_mapping(stmpe->domain, line);
+                       int nestedirq = irq_find_mapping(stmpe->domain, line);
 
                        handle_nested_irq(nestedirq);
                        status &= ~(1 << bit);