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 | |
| parent | 0da26bfb4ecea69226775572153fd85e2ab3785f (diff) | |
| download | kernel_samsung_crespo-9be7b631ab5fc185fe694301dddfb8dc5f2f8546.zip kernel_samsung_crespo-9be7b631ab5fc185fe694301dddfb8dc5f2f8546.tar.gz kernel_samsung_crespo-9be7b631ab5fc185fe694301dddfb8dc5f2f8546.tar.bz2 | |
Input: gpio_input: disable_irq -> disable_irq_nosync
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/input/misc/gpio_input.c | 4 | ||||
| -rw-r--r-- | drivers/input/misc/gpio_matrix.c | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/gpio_input.c b/drivers/input/misc/gpio_input.c index 6aef289..758df48 100644 --- a/drivers/input/misc/gpio_input.c +++ b/drivers/input/misc/gpio_input.c @@ -182,7 +182,7 @@ static irqreturn_t gpio_event_input_irq_handler(int irq, void *dev_id) ds->info->type, key_entry->code, keymap_index, key_entry->gpio); } else { - disable_irq(irq); + disable_irq_nosync(irq); ks->debounce = DEBOUNCE_UNSTABLE; } spin_unlock_irqrestore(&ds->irq_lock, irqflags); @@ -245,11 +245,9 @@ int gpio_event_input_func(struct gpio_event_input_devs *input_devs, di = container_of(info, struct gpio_event_input_info, info); if (func == GPIO_EVENT_FUNC_SUSPEND) { - spin_lock_irqsave(&ds->irq_lock, irqflags); if (ds->use_irq) for (i = 0; i < di->keymap_size; i++) disable_irq(gpio_to_irq(di->keymap[i].gpio)); - spin_unlock_irqrestore(&ds->irq_lock, irqflags); hrtimer_cancel(&ds->timer); return 0; } 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 @@ 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], |