aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchao bi <chao.bi@intel.com>2012-12-12 11:40:56 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-21 11:45:26 -0800
commit51478116612441b178bc747b445e592586e1f817 (patch)
tree7658887454dce70f3855571f6ed9040e658eb349
parentfd426d3b60d656d3b0df7c5ee2cdcb0a4e6f8850 (diff)
downloadlinux-linaro-stable-51478116612441b178bc747b445e592586e1f817.tar.gz
serial:ifx6x60:Delete SPI timer when shut down port
commit 014b9b4ce84281ccb3d723c792bed19815f3571a upstream. When shut down SPI port, it's possible that MRDY has been asserted and a SPI timer was activated waiting for SRDY assert, in the case, it needs to delete this timer. Signed-off-by: Chen Jun <jun.d.chen@intel.com> Signed-off-by: channing <chao.bi@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/ifx6x60.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 144cd39..17f587c 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -552,6 +552,7 @@ static void ifx_port_shutdown(struct tty_port *port)
container_of(port, struct ifx_spi_device, tty_port);
mrdy_set_low(ifx_dev);
+ del_timer(&ifx_dev->spi_timer);
clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
tasklet_kill(&ifx_dev->io_work_tasklet);
}