tty/serial: fix ifx6x60.c declaration warning
authorRandy Dunlap <rdunlap@infradead.org>
Mon, 26 Nov 2012 19:07:25 +0000 (11:07 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 26 Nov 2012 23:36:39 +0000 (15:36 -0800)
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>
drivers/tty/serial/ifx6x60.c

index 2783d96ff6103d18164795869b193ebe78fcb658..6356dba49e6ca74a85d8fd1616f0ae3cafa27cf8 100644 (file)
@@ -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);