From a5830b762e8bf48c65e2f2b46fab5f3c0fb6ae3d Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Mon, 24 Dec 2012 09:44:43 -0800 Subject: [PATCH] --- yaml --- r: 350662 b: refs/heads/master c: e7cd0aeb323441228ebbffb0c5a78ea1132663fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/input/touchscreen/wm831x-ts.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2834623b132e..4f9b6b5a9f35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7488b1b94b46f262a60a94d9468d324201574cf8 +refs/heads/master: e7cd0aeb323441228ebbffb0c5a78ea1132663fd diff --git a/trunk/drivers/input/touchscreen/wm831x-ts.c b/trunk/drivers/input/touchscreen/wm831x-ts.c index f88fab56178c..6be2eb6a153a 100644 --- a/trunk/drivers/input/touchscreen/wm831x-ts.c +++ b/trunk/drivers/input/touchscreen/wm831x-ts.c @@ -247,7 +247,7 @@ static int wm831x_ts_probe(struct platform_device *pdev) wm831x_ts = devm_kzalloc(&pdev->dev, sizeof(struct wm831x_ts), GFP_KERNEL); - input_dev = input_allocate_device(); + input_dev = devm_input_allocate_device(&pdev->dev); if (!wm831x_ts || !input_dev) { error = -ENOMEM; goto err_alloc; @@ -376,7 +376,6 @@ static int wm831x_ts_probe(struct platform_device *pdev) err_data_irq: free_irq(wm831x_ts->data_irq, wm831x_ts); err_alloc: - input_free_device(input_dev); return error; } @@ -387,7 +386,6 @@ static int wm831x_ts_remove(struct platform_device *pdev) free_irq(wm831x_ts->pd_irq, wm831x_ts); free_irq(wm831x_ts->data_irq, wm831x_ts); - input_unregister_device(wm831x_ts->input_dev); return 0; }