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

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

diff --git a/drivers/input/keyboard/amikbd.c b/drivers/input/keyboard/amikbd.c
index ba0b36f7daeafe1ee4f582e1b4fdd31325f9e42a..096d6067ae1f890fce38033e0c4321a55f5e15f4 100644 (file)
--- a/drivers/input/keyboard/amikbd.c
+++ b/drivers/input/keyboard/amikbd.c
@@ -246,7 +246,6 @@ static int __exit amikbd_remove(struct platform_device *pdev)
 {
        struct input_dev *dev = platform_get_drvdata(pdev);
 
-       platform_set_drvdata(pdev, NULL);
        free_irq(IRQ_AMIGA_CIAA_SP, dev);
        input_unregister_device(dev);
        return 0;