@@ -345,7 +345,7 @@ static void __tsc2005_disable(struct tsc2005 *ts)
disable_irq(ts->spi->irq);
del_timer_sync(&ts->penup_timer);
- cancel_delayed_work_sync(&ts->esd_work);
+ cancel_delayed_work(&ts->esd_work);
enable_irq(ts->spi->irq);
}
@@ -479,6 +479,12 @@ static void tsc2005_esd_work(struct work_struct *work)
mutex_lock(&ts->mutex);
+ /* The device has been just closed or suspended. */
+ if (!ts->opened || ts->suspended) {
+ mutex_unlock(&ts->mutex);
+ return;
+ }
+
if (time_is_after_jiffies(ts->last_valid_interrupt +
msecs_to_jiffies(ts->esd_timeout)))
goto out;
@@ -685,6 +691,7 @@ static int __devexit tsc2005_remove(struct spi_device *spi)
free_irq(ts->spi->irq, ts);
input_unregister_device(ts->idev);
+ cancel_delayed_work_sync(&ts->esd_work);
kfree(ts);
spi_set_drvdata(spi, NULL);