aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/atmel_tsadcc.c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2011-05-14 22:22:38 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2011-05-14 23:42:41 -0700
commit215ef98677c3e43cefd2159d76543f368a7f87b9 (patch)
tree212cf3039aaaf92509f80347ab4bc9f788ea8700 /drivers/input/touchscreen/atmel_tsadcc.c
parentInput: add driver FSL MPR121 capacitive touch sensor (diff)
downloadlinux-dev-215ef98677c3e43cefd2159d76543f368a7f87b9.tar.xz
linux-dev-215ef98677c3e43cefd2159d76543f368a7f87b9.zip
Input: atmel_tsadcc - correct call to input_free_device
This error handling code can be reached before ts_dev->input is initialized, so it is safer to always use the original name, input_dev. Signed-off-by: Julia Lawall <julia@diku.dk> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/touchscreen/atmel_tsadcc.c')
-rw-r--r--drivers/input/touchscreen/atmel_tsadcc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/atmel_tsadcc.c b/drivers/input/touchscreen/atmel_tsadcc.c
index 3d9b5166ebe9..432c69be6ac6 100644
--- a/drivers/input/touchscreen/atmel_tsadcc.c
+++ b/drivers/input/touchscreen/atmel_tsadcc.c
@@ -317,7 +317,7 @@ err_unmap_regs:
err_release_mem:
release_mem_region(res->start, resource_size(res));
err_free_dev:
- input_free_device(ts_dev->input);
+ input_free_device(input_dev);
err_free_mem:
kfree(ts_dev);
return err;