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

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

diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c
index 9857e8fd09871ae279d736254dca89f0cef08c7f..47206bdba4113a54db431d581a62b84da93b28ed 100644 (file)
--- a/drivers/input/keyboard/ep93xx_keypad.c
+++ b/drivers/input/keyboard/ep93xx_keypad.c
@@ -329,8 +329,7 @@ static int ep93xx_keypad_probe(struct platform_device *pdev)
        return 0;
 
 failed_free_irq:
-       free_irq(keypad->irq, pdev);
-       platform_set_drvdata(pdev, NULL);
+       free_irq(keypad->irq, keypad);
 failed_free_dev:
        input_free_device(input_dev);
 failed_put_clk:
@@ -351,9 +350,7 @@ static int ep93xx_keypad_remove(struct platform_device *pdev)
        struct ep93xx_keypad *keypad = platform_get_drvdata(pdev);
        struct resource *res;
 
-       free_irq(keypad->irq, pdev);
-
-       platform_set_drvdata(pdev, NULL);
+       free_irq(keypad->irq, keypad);
 
        if (keypad->enabled)
                clk_disable(keypad->clk);