diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index 9857e8fd0987..a8d5aacfb98b 100644
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -330,7 +330,6 @@ static int ep93xx_keypad_probe(struct platform_device *pdev)
 
 failed_free_irq:
 	free_irq(keypad->irq, pdev);
-	platform_set_drvdata(pdev, NULL);
 failed_free_dev:
 	input_free_device(input_dev);
 failed_put_clk:
@@ -353,8 +352,6 @@ static int ep93xx_keypad_remove(struct platform_device *pdev)
 
 	free_irq(keypad->irq, pdev);
 
-	platform_set_drvdata(pdev, NULL);
-
 	if (keypad->enabled)
 		clk_disable(keypad->clk);
 	clk_put(keypad->clk);