aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-08-21 22:01:45 -0700
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-08-21 22:03:04 -0700
commita1d0fa776870aeda5eb91b131d0f1aede6d94ef1 (patch)
treeb8a4c444355370b17d761ef6f8a4a9c4ab9ce980 /drivers/input/touchscreen
parentMerge branch 'next' into for-linus (diff)
downloadlinux-dev-a1d0fa776870aeda5eb91b131d0f1aede6d94ef1.tar.xz
linux-dev-a1d0fa776870aeda5eb91b131d0f1aede6d94ef1.zip
Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FS
This fixes the following breakage: edt-ft5x06.c: In function edt_ft5x06_ts_remove: edt-ft5x06.c:846:14: error: struct edt_ft5x06_ts_data has no member named raw_buffer Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Simon Budig <simon.budig@kernelconcepts.de> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/edt-ft5x06.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 9afc777a40a7..b06a5e3a665e 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -602,6 +602,7 @@ edt_ft5x06_ts_teardown_debugfs(struct edt_ft5x06_ts_data *tsdata)
{
if (tsdata->debug_dir)
debugfs_remove_recursive(tsdata->debug_dir);
+ kfree(tsdata->raw_buffer);
}
#else
@@ -843,7 +844,6 @@ static int __devexit edt_ft5x06_ts_remove(struct i2c_client *client)
if (gpio_is_valid(pdata->reset_pin))
gpio_free(pdata->reset_pin);
- kfree(tsdata->raw_buffer);
kfree(tsdata);
return 0;