GIC is designed to support two of trigger mechanisms - active level
high or edge rising. But in the gpio_keys driver, it tries to use both
edge rising and edge falling trigger. This patch fixes the gpio_keys
driver to request only the edge rising event when failed to configure the
interrupt.

Signed-off-by: Y Vo <y...@apm.com>
---
 drivers/input/keyboard/gpio_keys.c |   20 +++++++++++++++++---
 1 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/drivers/input/keyboard/gpio_keys.c 
b/drivers/input/keyboard/gpio_keys.c
index ddf4045..7c3da2c 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -532,9 +532,23 @@ static int gpio_keys_setup_key(struct platform_device 
*pdev,
        error = devm_request_any_context_irq(&pdev->dev, bdata->irq,
                                             isr, irqflags, desc, bdata);
        if (error < 0) {
-               dev_err(dev, "Unable to claim irq %d; error %d\n",
-                       bdata->irq, error);
-               return error;
+               /*
+                * Attempt to request again with only rising edge trigger
+                */
+               if ((irqflags & (IRQ_TYPE_EDGE_RISING | IRQF_TRIGGER_FALLING))) 
{
+                       irqflags = IRQ_TYPE_EDGE_RISING;
+                       error = devm_request_any_context_irq(&pdev->dev, 
bdata->irq,
+                                                            isr, irqflags, 
desc, bdata);
+                       if (error < 0) {
+                               dev_err(dev, "Unable to claim irq %d; error 
%d\n",
+                                       bdata->irq, error);
+                               return error;
+                       }
+               } else {
+                       dev_err(dev, "Unable to claim irq %d; error %d\n",
+                               bdata->irq, error);
+                       return error;
+               }
        }
 
        return 0;
-- 
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to