From 2330041beb3368d1a068233bfccb1b93ac171473 Mon Sep 17 00:00:00 2001 From: Jun Chen Date: Wed, 7 Nov 2012 12:04:04 -0500 Subject: [PATCH] --- yaml --- r: 338406 b: refs/heads/master c: e8823f1ca8d5a0c5d69a8862682ee8bde26990ca h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/ifx6x60.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e16cc96707db..6693e84c7d7f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b2f8a9550f92686fb76f9dd4d0ec7c0c3f1b027 +refs/heads/master: e8823f1ca8d5a0c5d69a8862682ee8bde26990ca diff --git a/trunk/drivers/tty/serial/ifx6x60.c b/trunk/drivers/tty/serial/ifx6x60.c index 21eb70bcb6a0..1754c147a94c 100644 --- a/trunk/drivers/tty/serial/ifx6x60.c +++ b/trunk/drivers/tty/serial/ifx6x60.c @@ -508,9 +508,16 @@ static int ifx_spi_write(struct tty_struct *tty, const unsigned char *buf, { struct ifx_spi_device *ifx_dev = tty->driver_data; unsigned char *tmp_buf = (unsigned char *)buf; - int tx_count = kfifo_in_locked(&ifx_dev->tx_fifo, tmp_buf, count, - &ifx_dev->fifo_lock); - mrdy_assert(ifx_dev); + unsigned long flags; + bool is_fifo_empty; + + spin_lock_irqsave(&ifx_dev->fifo_lock, flags); + is_fifo_empty = kfifo_is_empty(&ifx_dev->tx_fifo); + int tx_count = kfifo_in(&ifx_dev->tx_fifo, tmp_buf, count); + spin_unlock_irqrestore(&ifx_dev->fifo_lock, flags); + if (is_fifo_empty) + mrdy_assert(ifx_dev); + return tx_count; }