---

yaml --- r: 338387 b: refs/heads/master c: 2e30802 h: refs/heads/master i: 338385: 76176aa 338383: 27ff644 v: v3
git-mirror · Oct 25, 2012 · 0f8b7a3 · 0f8b7a3
1 parent 07fb15a
commit 0f8b7a3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c73ba2ae43fd4d69589caeecc5260a41be87b759
+refs/heads/master: 2e30802625f5754e9a0ce478a447ed0f2376d4d4
diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c
@@ -866,7 +866,7 @@ static int ifx_spi_create_port(struct ifx_spi_device *ifx_dev)
 static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev)
 {
 	if (test_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags)) {
-		del_timer_sync(&ifx_dev->spi_timer);
+		del_timer(&ifx_dev->spi_timer);
 		clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags);
 	}