From 07fb15a4a8975da74b8ba727e4bf419b7b43e5ce Mon Sep 17 00:00:00 2001
From: Jun Chen <jun.d.chen@intel.com>
Date: Mon, 22 Oct 2012 10:23:07 -0400
Subject: [PATCH] --- yaml --- r: 338386 b: refs/heads/master c:
 c73ba2ae43fd4d69589caeecc5260a41be87b759 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 31a59b45b3a9..f6712f285e52 100644
--- 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
index 2d2bcbd80670..4b001ea4b0b8 100644
--- 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);
 
 		}
 	}