diff options
| author | Arve Hjønnevåg <arve@android.com> | 2009-04-17 18:24:59 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-14 09:08:48 -0700 |
| commit | 9be7b631ab5fc185fe694301dddfb8dc5f2f8546 (patch) | |
| tree | 8467551cb38a740d1a0404c677c51481ffd3595d /drivers/input/misc/gpio_matrix.c | |
| parent | 0da26bfb4ecea69226775572153fd85e2ab3785f (diff) | |
Input: gpio_input: disable_irq -> disable_irq_nosync
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers/input/misc/gpio_matrix.c')
| -rw-r--r-- | drivers/input/misc/gpio_matrix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/gpio_matrix.c b/drivers/input/misc/gpio_matrix.c index adb00ab47b6..f645471b54d 100644 --- a/drivers/input/misc/gpio_matrix.c +++ b/drivers/input/misc/gpio_matrix.c @@ -220,7 +220,7 @@ static irqreturn_t gpio_keypad_irq_handler(int irq_in, void *dev_id) return IRQ_HANDLED; for (i = 0; i < mi->ninputs; i++) - disable_irq(gpio_to_irq(mi->input_gpios[i])); + disable_irq_nosync(gpio_to_irq(mi->input_gpios[i])); for (i = 0; i < mi->noutputs; i++) { if (gpio_keypad_flags & GPIOKPF_DRIVE_INACTIVE) gpio_set_value(mi->output_gpios[i], |