Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 338466
b: refs/heads/master
c: bc6835a
h: refs/heads/master
v: v3
  • Loading branch information
Randy Dunlap authored and Greg Kroah-Hartman committed Nov 26, 2012
1 parent 6617a49 commit d71806c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 666ca0b9b706ca3ee11f7bcba1f845a127937b41
refs/heads/master: bc6835a41aea115d97a74d67dc95faa0bbc63d5f
3 changes: 2 additions & 1 deletion trunk/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 d71806c

Please sign in to comment.