Merge branch 'drm-fixes-3.11' of git://people.freedesktop.org/~agd5f/linux

[~andy/linux] / drivers / input / keyboard / w90p910_keypad.c

diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c
index ee163bee8cce3c32e2ec3a50181dd4d1c56fafdb..7b039162a3f833485239274e613aad5cd6ad8710 100644 (file)
--- a/drivers/input/keyboard/w90p910_keypad.c
+++ b/drivers/input/keyboard/w90p910_keypad.c
@@ -221,7 +221,7 @@ static int w90p910_keypad_probe(struct platform_device *pdev)
        return 0;
 
 failed_free_irq:
-       free_irq(irq, pdev);
+       free_irq(irq, keypad);
 failed_put_clk:
        clk_put(keypad->clk);
 failed_free_io:
@@ -239,7 +239,7 @@ static int w90p910_keypad_remove(struct platform_device *pdev)
        struct w90p910_keypad *keypad = platform_get_drvdata(pdev);
        struct resource *res;
 
-       free_irq(keypad->irq, pdev);
+       free_irq(keypad->irq, keypad);
 
        clk_put(keypad->clk);
 
@@ -249,7 +249,6 @@ static int w90p910_keypad_remove(struct platform_device *pdev)
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        release_mem_region(res->start, resource_size(res));
 
-       platform_set_drvdata(pdev, NULL);
        kfree(keypad);
 
        return 0;