Merge branch 'for-next' of git://github.com/rydberg/linux into next

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

diff --git a/drivers/input/keyboard/spear-keyboard.c b/drivers/input/keyboard/spear-keyboard.c
index cb1e8f614631582b342546458d9c1fc462b55df7..7111124b53621de7c5de1df601f1d1fba6f8505f 100644 (file)
--- a/drivers/input/keyboard/spear-keyboard.c
+++ b/drivers/input/keyboard/spear-keyboard.c
@@ -290,7 +290,6 @@ static int spear_kbd_remove(struct platform_device *pdev)
        clk_unprepare(kbd->clk);
 
        device_init_wakeup(&pdev->dev, 0);
-       platform_set_drvdata(pdev, NULL);
 
        return 0;
 }