summaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@infradead.org>2012-11-26 23:07:25 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-27 03:36:39 +0400
commitbc6835a41aea115d97a74d67dc95faa0bbc63d5f (patch)
tree63e6811cf339fa68c3a8bc1800a3da12d411d703 /drivers/tty
parent666ca0b9b706ca3ee11f7bcba1f845a127937b41 (diff)
downloadlinux-bc6835a41aea115d97a74d67dc95faa0bbc63d5f.tar.xz
tty/serial: fix ifx6x60.c declaration warning
Fix gcc warning of mixed data/code: drivers/tty/serial/ifx6x60.c:516:2: warning: ISO C90 forbids mixed declarations and code Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Russ Gorby <russ.gorby@intel.com> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/serial/ifx6x60.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 2783d96ff610..6356dba49e6c 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -510,10 +510,11 @@ static int ifx_spi_write(struct tty_struct *tty, const unsigned char *buf,
unsigned char *tmp_buf = (unsigned char *)buf;
unsigned long flags;
bool is_fifo_empty;
+ int tx_count;
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);
+ 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);