From: Jun Chen <jun.d.chen@intel.com>
Date: Fri, 19 Oct 2012 13:51:30 +0000 (-0400)
Subject: serial: ifx6x60: del_timer_sync must not be called in interrupt context.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=2e30802625f5754e9a0ce478a447ed0f2376d4d4;p=linux-beck.git

serial: ifx6x60: del_timer_sync must not be called in interrupt context.

This patch make use of del_timer instead of del_timer_sync in the
interrupt context.
The spi_timer function don't use any resources that may release after
running del_timer,
so using the del_timer is also safe and enough in this context.

Signed-off-by: Chen Jun <jun.d.chen@intel.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Tested-by: Chuansheng Liu <chuansheng.liu@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 4b001ea4b0b8..e595c832be20 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -866,7 +866,7 @@ error_ret:
 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);
 	}