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

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

diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c
index 7ac5f174c6f76a5507c6873f8ac01eae65abff68..7b9b44158ad1426453c733aae94c774e5dc0eca1 100644 (file)
--- a/drivers/input/keyboard/opencores-kbd.c
+++ b/drivers/input/keyboard/opencores-kbd.c
@@ -151,8 +151,6 @@ static int opencores_kbd_remove(struct platform_device *pdev)
        input_unregister_device(opencores_kbd->input);
        kfree(opencores_kbd);
 
-       platform_set_drvdata(pdev, NULL);
-
        return 0;
 }