---

yaml --- r: 338386 b: refs/heads/master c: c73ba2a h: refs/heads/master v: v3
git-mirror · Oct 25, 2012 · 07fb15a · 07fb15a
1 parent 76176aa
commit 07fb15a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 319fb0d21907f771d8ccdb6177fb2fcafabc6ab4
+refs/heads/master: c73ba2ae43fd4d69589caeecc5260a41be87b759
diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c
@@ -231,9 +231,7 @@ static void mrdy_assert(struct ifx_spi_device *ifx_dev)
 	if (!val) {
 		if (!test_and_set_bit(IFX_SPI_STATE_TIMER_PENDING,
 				      &ifx_dev->flags)) {
-			ifx_dev->spi_timer.expires =
-				jiffies + IFX_SPI_TIMEOUT_SEC*HZ;
-			add_timer(&ifx_dev->spi_timer);
+			mod_timer(&ifx_dev->spi_timer,jiffies + IFX_SPI_TIMEOUT_SEC*HZ);
 
 		}
 	}