The patch titled tsc2007: Cancel work sync, increase polling frequency, make exit platform hw callback optional has been removed from the -mm tree. Its filename was input-tsc2007-remove-hr-timer-fix.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: tsc2007: Cancel work sync, increase polling frequency, make exit platform hw callback optional In the remove function, ancel the work using the _sync version, to make sure any running "work" is finished. Make the exit_platform_hw callback optional since it's not needed on all platforms. When the screen is touched, the polling frequency is increased to reduce the risk of missing taps. Signed-off-by: Richard Röjfors <richard.rojfors.ext@xxxxxxxxxxxxxxx> Cc: Thierry Reding <thierry.reding@xxxxxxxxxxxxxxxxx> Cc: Trilok Soni <soni.trilok@xxxxxxxxx> Cc: <kwangwoo.lee@xxxxxxxxx> Cc: Dmitry Torokhov <dtor@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/input/touchscreen/tsc2007.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/input/touchscreen/tsc2007.c~input-tsc2007-remove-hr-timer-fix drivers/input/touchscreen/tsc2007.c --- a/drivers/input/touchscreen/tsc2007.c~input-tsc2007-remove-hr-timer-fix +++ a/drivers/input/touchscreen/tsc2007.c @@ -27,7 +27,7 @@ #include <linux/i2c.h> #include <linux/i2c/tsc2007.h> -#define TS_POLL_PERIOD msecs_to_jiffies(5) /* ms delay between samples */ +#define TS_POLL_PERIOD msecs_to_jiffies(1) /* ms delay between samples */ #define TSC2007_MEASURE_TEMP0 (0x0 << 4) #define TSC2007_MEASURE_AUX (0x2 << 4) @@ -314,11 +314,11 @@ static int tsc2007_remove(struct i2c_cli struct tsc2007 *ts = i2c_get_clientdata(client); struct tsc2007_platform_data *pdata; - /* cancel any work */ - cancel_delayed_work(&ts->work); + cancel_delayed_work_sync(&ts->work); pdata = client->dev.platform_data; - pdata->exit_platform_hw(); + if (pdata->exit_platform_hw) + pdata->exit_platform_hw(); free_irq(ts->irq, ts); input_unregister_device(ts->input); _ Patches currently in -mm which might be from richard.rojfors.ext@xxxxxxxxxxxxxxx are linux-next.patch video-initial-support-for-adv7180.patch gpio-add-mc33880-driver.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html