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

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

diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index 5ceef636df2f8f345d143833e4059c3b18510776..b0ad457ca9d8ede1a5411e940b3dae7f0c2e57a1 100644 (file)
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
@@ -146,7 +146,6 @@ static int jornada720_kbd_probe(struct platform_device *pdev)
  fail2:        /* IRQ, DEVICE, MEMORY */
        free_irq(IRQ_GPIO0, pdev);
  fail1:        /* DEVICE, MEMORY */
-       platform_set_drvdata(pdev, NULL);
        input_free_device(input_dev);
        kfree(jornadakbd);
        return err;
@@ -157,7 +156,6 @@ static int jornada720_kbd_remove(struct platform_device *pdev)
        struct jornadakbd *jornadakbd = platform_get_drvdata(pdev);
 
        free_irq(IRQ_GPIO0, pdev);
-       platform_set_drvdata(pdev, NULL);
        input_unregister_device(jornadakbd->input);
        kfree(jornadakbd);