From e4cbd81bbba059a71967b091547c3fbbf56f2f2b Mon Sep 17 00:00:00 2001
From: chao bi <chao.bi@intel.com>
Date: Wed, 12 Dec 2012 11:40:56 +0800
Subject: [PATCH] --- yaml --- r: 348906 b: refs/heads/master c:
 014b9b4ce84281ccb3d723c792bed19815f3571a h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/tty/serial/ifx6x60.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index b44c5c1d5d20..3452fe5a6cc7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7b9041b208d09c114d9d30ff1b7f860b7765f45
+refs/heads/master: 014b9b4ce84281ccb3d723c792bed19815f3571a
diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c
index 675d94ab0aff..7eed3235dad4 100644
--- a/trunk/drivers/tty/serial/ifx6x60.c
+++ b/trunk/drivers/tty/serial/ifx6x60.c
@@ -637,6 +637,7 @@ static void ifx_port_shutdown(struct tty_port *port)
 
 	clear_bit(IFX_SPI_STATE_IO_AVAILABLE, &ifx_dev->flags);
 	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);
 }