From b0be449b496bc8d3be64c292dea8f02b4b18c9e7 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Tue, 31 Jul 2012 22:08:47 -0700 Subject: [PATCH] --- yaml --- r: 328509 b: refs/heads/master c: a78769b80d73468d53d0ad70c5a9e3fd9ff9dc54 h: refs/heads/master i: 328507: 462ba837686320bef1c5dcac883e89f06696ee58 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/rotary_encoder.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2063682e2059..bc65e7f8c649 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a2f25245269d754a9fd687a15db975271a58c5e0 +refs/heads/master: a78769b80d73468d53d0ad70c5a9e3fd9ff9dc54 diff --git a/trunk/drivers/input/misc/rotary_encoder.c b/trunk/drivers/input/misc/rotary_encoder.c index f07f784198b9..00a7bdabb0b3 100644 --- a/trunk/drivers/input/misc/rotary_encoder.c +++ b/trunk/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;