summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDaniel Mack <zonque@gmail.com>2012-07-31 22:08:47 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-08-21 22:29:50 -0700
commita78769b80d73468d53d0ad70c5a9e3fd9ff9dc54 (patch)
tree1b1e90df01fecc0294c3015a2315bbcd73e2f253 /drivers/input
parenta2f25245269d754a9fd687a15db975271a58c5e0 (diff)
downloadop-kernel-dev-a78769b80d73468d53d0ad70c5a9e3fd9ff9dc54.zip
op-kernel-dev-a78769b80d73468d53d0ad70c5a9e3fd9ff9dc54.tar.gz
Input: rotary-encoder - defer calls gpio_to_irq()
Don't call gpio_to_irq() on GPIOs before gpio_request() succeeded on them. This avoids Ooopses with incorrect DT bindings. Signed-off-by: Daniel Mack <zonque@gmail.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/misc/rotary_encoder.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index f07f784..00a7bda 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -163,8 +163,6 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
encoder->input = input;
encoder->pdata = pdata;
- encoder->irq_a = gpio_to_irq(pdata->gpio_a);
- encoder->irq_b = gpio_to_irq(pdata->gpio_b);
/* create and register the input driver */
input->name = pdev->name;
@@ -215,6 +213,9 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
goto exit_free_gpio_a;
}
+ encoder->irq_a = gpio_to_irq(pdata->gpio_a);
+ encoder->irq_b = gpio_to_irq(pdata->gpio_b);
+
/* request the IRQs */
if (pdata->half_period) {
handler = &rotary_encoder_half_period_irq;
OpenPOWER on IntegriCloud