Merge tag 'please-pull-misc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / input / misc / wm831x-on.c

diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c
index 558767d8ebf43d501d77cb3277a706a722a92681..caa2c4068f0924f8070c705501f6771e6f0152fe 100644 (file)
--- a/drivers/input/misc/wm831x-on.c
+++ b/drivers/input/misc/wm831x-on.c
@@ -86,7 +86,7 @@ static int wm831x_on_probe(struct platform_device *pdev)
        wm831x_on->wm831x = wm831x;
        INIT_DELAYED_WORK(&wm831x_on->work, wm831x_poll_on);
 
-       wm831x_on->dev = input_allocate_device();
+       wm831x_on->dev = devm_input_allocate_device(&pdev->dev);
        if (!wm831x_on->dev) {
                dev_err(&pdev->dev, "Can't allocate input dev\n");
                ret = -ENOMEM;
@@ -119,7 +119,6 @@ static int wm831x_on_probe(struct platform_device *pdev)
 err_irq:
        free_irq(irq, wm831x_on);
 err_input_dev:
-       input_free_device(wm831x_on->dev);
 err:
        return ret;
 }
@@ -131,7 +130,6 @@ static int wm831x_on_remove(struct platform_device *pdev)
 
        free_irq(irq, wm831x_on);
        cancel_delayed_work_sync(&wm831x_on->work);
-       input_unregister_device(wm831x_on->dev);
 
        return 0;
 }