Pull branch 'for-rmk' of git://git.linaro.org/people/ardbiesheuvel/linux-arm into...

[karo-tx-linux.git] / drivers / input / keyboard / gpio_keys.c

diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index b29ca651a3951e568527e4c7a041f101bba06c3a..440ce32462baefafcabdda55c5c168c27753757c 100644 (file)
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -767,7 +767,6 @@ static int gpio_keys_probe(struct platform_device *pdev)
        while (--i >= 0)
                gpio_remove_key(&ddata->data[i]);
 
-       platform_set_drvdata(pdev, NULL);
  fail1:
        input_free_device(input);
        kfree(ddata);