Skip to content

Commit

Permalink
tty/serial: fix ifx6x60.c declaration warning
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Nov 26, 2012
1 parent 666ca0b commit bc6835a
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/tty/serial/ifx6x60.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit bc6835a

Please sign in to comment.