diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2008-06-27 15:21:55 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-02 20:46:14 -0700 |
| commit | 2a739dd53ad7ee010ae6e155438507f329dce788 (patch) | |
| tree | e708d4cba463f4ac6a6813491f10e993e0953ca2 /drivers/net/irda/irtty-sir.c | |
| parent | 3ad3367cdc36ff6ce4efd2159c39923a2b334f94 (diff) | |
TTY: fix for tty operations bugs
This is fixed with the recent tty operations rewrite in mainline in a
different way, this is a selective backport of the relevant portions to
the -stable tree.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/net/irda/irtty-sir.c')
| -rw-r--r-- | drivers/net/irda/irtty-sir.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index fc753d7f674e..df755f501e67 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c @@ -64,7 +64,9 @@ static int irtty_chars_in_buffer(struct sir_dev *dev) IRDA_ASSERT(priv != NULL, return -1;); IRDA_ASSERT(priv->magic == IRTTY_MAGIC, return -1;); - return priv->tty->driver->chars_in_buffer(priv->tty); + if (priv->tty->driver->chars_in_buffer) + return priv->tty->driver->chars_in_buffer(priv->tty); + return 0; } /* Wait (sleep) until underlaying hardware finished transmission |