diff options
author | Jun Chen <jun.d.chen@intel.com> | 2012-10-19 09:51:30 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-25 14:29:58 -0400 |
commit | 2e30802625f5754e9a0ce478a447ed0f2376d4d4 (patch) | |
tree | e7b488f15b183a70f7d520fe6acc2099d18e9c2a /drivers/tty/serial/ifx6x60.c | |
parent | c73ba2ae43fd4d69589caeecc5260a41be87b759 (diff) |
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>
Diffstat (limited to 'drivers/tty/serial/ifx6x60.c')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
866 | static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev) | 866 | static void ifx_spi_handle_srdy(struct ifx_spi_device *ifx_dev) |
867 | { | 867 | { |
868 | if (test_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags)) { | 868 | if (test_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags)) { |
869 | del_timer_sync(&ifx_dev->spi_timer); | 869 | del_timer(&ifx_dev->spi_timer); |
870 | clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags); | 870 | clear_bit(IFX_SPI_STATE_TIMER_PENDING, &ifx_dev->flags); |
871 | } | 871 | } |
872 | 872 | ||