From 8486ab0067feaec42f19b8385a976d7405d64241 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 24 Dec 2012 09:45:22 -0800 Subject: [PATCH] --- yaml --- r: 350663 b: refs/heads/master c: 5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4 h: refs/heads/master i: 350661: 80044c1da3ccdee97d4f7a1795bca7f65c11d8a1 350659: 55bc8b1abedf8d78f3e2899d75f4dea7bf8c2c72 350655: 2094e5c909d144bda448a1508fcab444b138dd46 v: v3 --- [refs] | 2 +- trunk/drivers/input/misc/wm831x-on.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4f9b6b5a9f35..213626b9daee 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7cd0aeb323441228ebbffb0c5a78ea1132663fd +refs/heads/master: 5d3caa442e0858fa07b9a6a68d05e1ba2cf246a4 diff --git a/trunk/drivers/input/misc/wm831x-on.c b/trunk/drivers/input/misc/wm831x-on.c index 558767d8ebf4..caa2c4068f09 100644 --- a/trunk/drivers/input/misc/wm831x-on.c +++ b/trunk/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; }