commit 9be7b631ab5fc185fe694301dddfb8dc5f2f8546
author Arve Hjønnevåg <arve@android.com> Fri Apr 17 18:24:59 2009 -0700
committer Colin Cross <ccross@android.com> Tue Jun 14 09:08:48 2011 -0700
tree 8467551cb38a740d1a0404c677c51481ffd3595d
parent 0da26bfb4ecea69226775572153fd85e2ab3785f

Input: gpio_input: disable_irq -> disable_irq_nosync

Signed-off-by: Arve Hjønnevåg <arve@android.com>

drivers/input/misc/gpio_matrix.c

diff --git a/drivers/input/misc/gpio_matrix.c b/drivers/input/misc/gpio_matrix.c
index adb00ab..f645471 100644
--- a/drivers/input/misc/gpio_matrix.c
+++ b/drivers/input/misc/gpio_matrix.c
@@ -220,7 +220,7 @@
 		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],