From 0f8b7a3812d75998b264f42161a51b6237ce9100 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Fri, 19 Oct 2012 09:51:30 -0400 Subject: [PATCH] --- yaml --- r: 338387 b: refs/heads/master c: 2e30802625f5754e9a0ce478a447ed0f2376d4d4 h: refs/heads/master i: 338385: 76176aae26359514013a17024c86612d52342a20 338383: 27ff644e11ce9e836c8b190dd3e801b7152201fa v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/ifx6x60.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index f6712f285e52..bea930cfd158 100644 --- 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 index 4b001ea4b0b8..e595c832be20 100644 --- 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); }