From: Randy Dunlap <rdunlap@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxx> Cc: Russ Gorby <russ.gorby@xxxxxxxxx> Cc: Alan Cox <alan@xxxxxxxxxxxxxxx> Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Cc: linux-serial@xxxxxxxxxxxxxxx --- drivers/tty/serial/ifx6x60.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- linux-next-20121126.orig/drivers/tty/serial/ifx6x60.c +++ linux-next-20121126/drivers/tty/serial/ifx6x60.c @@ -510,10 +510,11 @@ static int ifx_spi_write(struct tty_stru 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); -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
