---

yaml --- r: 348906 b: refs/heads/master c: 014b9b4 h: refs/heads/master v: v3
git-mirror · Jan 16, 2013 · e4cbd81 · e4cbd81
1 parent 6c20b43
commit e4cbd81
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git 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
@@ -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);
 }