OSDN Git Service

mfd: Correct copy and paste mistake in stmpe
authorLee Jones <lee.jones@linaro.org>
Mon, 5 Nov 2012 15:10:32 +0000 (16:10 +0100)
committerSamuel Ortiz <sameo@linux.intel.com>
Sun, 11 Nov 2012 22:35:03 +0000 (23:35 +0100)
When specifying IRQ numbers for the stmpe1601, IRQ defines for the
stmpe24xx were used instead. Fortunately, the defined numbers are
the same, hence why it survived testing. This fix is merely an
aesthetic one.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
drivers/mfd/stmpe.c

index 5c8d8f2..e50ebdf 100644 (file)
@@ -519,12 +519,12 @@ static const u8 stmpe1601_regs[] = {
 static struct stmpe_variant_block stmpe1601_blocks[] = {
        {
                .cell   = &stmpe_gpio_cell,
-               .irq    = STMPE24XX_IRQ_GPIOC,
+               .irq    = STMPE1601_IRQ_GPIOC,
                .block  = STMPE_BLOCK_GPIO,
        },
        {
                .cell   = &stmpe_keypad_cell,
-               .irq    = STMPE24XX_IRQ_KEYPAD,
+               .irq    = STMPE1601_IRQ_KEYPAD,
                .block  = STMPE_BLOCK_KEYPAD,
        },
 };