Merge commit 'v2.6.26-rc9' into cpus4096

[linux-2.6] / drivers / input / keyboard / sh_keysc.c

diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c
index 5d0864a9e94bbe84d696297428ff2d0cc3bdd231..8486abc457edd02c982cde57319388711cddc694 100644 (file)
--- a/drivers/input/keyboard/sh_keysc.c
+++ b/drivers/input/keyboard/sh_keysc.c
@@ -238,7 +238,6 @@ static int __devexit sh_keysc_remove(struct platform_device *pdev)
 
        input_unregister_device(priv->input);
        free_irq(platform_get_irq(pdev, 0), pdev);
-       input_free_device(priv->input);
        iounmap(priv->iomem_base);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);