Merge tag 'for-linus-v3.11-rc1' of git://oss.sgi.com/xfs/xfs

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

diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c
index 71d77192ac1ef7a1dfa48317b737493a1ac4cffc..90ff73ace42496a26fbec96081847d4f23fcfae6 100644 (file)
--- a/drivers/input/keyboard/matrix_keypad.c
+++ b/drivers/input/keyboard/matrix_keypad.c
@@ -549,8 +549,6 @@ static int matrix_keypad_remove(struct platform_device *pdev)
        input_unregister_device(keypad->input_dev);
        kfree(keypad);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }