Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (62 commits)
  Input: atkbd - release previously reserved keycodes 248 - 254
  Input: add KEY_WPS_BUTTON definition
  Input: ads7846 - add regulator support
  Input: winbond-cir - fix suspend/resume
  Input: gamecon - use pr_err() and friends
  Input: gamecon - constify some of the setup structures
  Input: gamecon - simplify pad type handling
  Input: gamecon - simplify coordinate calculation for PSX
  Input: gamecon - fix some formatting issues
  Input: gamecon - add rumble support for N64 pads
  Input: wacom - add device type to device name string
  Input: s3c24xx_ts - report touch only when stylus is down
  Input: s3c24xx_ts - re-enable IRQ on resume
  Input: wacom - constify product features data
  Input: wacom - use per-device instance of wacom_features
  Input: sh_keysc - enable building on SH-Mobile ARM
  Input: wacom - get features from driver info
  Input: rotary-encoder - set gpio direction for each requested gpio
  Input: sh_keysc - update the driver with mode 6
  Input: sh_keysc - switch to using bitmaps
  ...

1 files changed, 14 insertions, 0 deletions

diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index 3b9f588fc74..4ae07935985 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -152,6 +152,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                 goto exit_unregister_input;
         }
 
+        err = gpio_direction_input(pdata->gpio_a);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_a);
+                goto exit_unregister_input;
+        }
+
         err = gpio_request(pdata->gpio_b, DRV_NAME);
         if (err) {
                 dev_err(&pdev->dev, "unable to request GPIO %d\n",
@@ -159,6 +166,13 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
                 goto exit_free_gpio_a;
         }
 
+        err = gpio_direction_input(pdata->gpio_b);
+        if (err) {
+                dev_err(&pdev->dev, "unable to set GPIO %d for input\n",
+                        pdata->gpio_b);
+                goto exit_free_gpio_a;
+        }
+
         /* request the IRQs */
         err = request_irq(encoder->irq_a, &rotary_encoder_irq,
                           IORESOURCE_IRQ_HIGHEDGE | IORESOURCE_IRQ_LOWEDGE,