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

[~andy/linux] / drivers / input / keyboard / omap4-keypad.c

diff --git a/drivers/input/keyboard/omap4-keypad.c b/drivers/input/keyboard/omap4-keypad.c
index 1b289092f4e30915ce9005678f8ca84991435b3b..f4aa53a1fd69bb70f0e680e95688e251f355f1e9 100644 (file)
--- a/drivers/input/keyboard/omap4-keypad.c
+++ b/drivers/input/keyboard/omap4-keypad.c
@@ -419,8 +419,6 @@ static int omap4_keypad_remove(struct platform_device *pdev)
        kfree(keypad_data->keymap);
        kfree(keypad_data);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }