aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda/ircomm/ircomm_tty.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2016-04-09 17:06:48 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-04-30 09:26:55 -0700
commit18900ca65a8553edc608b6c9d518eb31e6c09ba1 (patch)
tree6712f933f9145ce4ad365388817266c0c9ebac68 /net/irda/ircomm/ircomm_tty.c
parenttty: amba-pl011: Use 32-bit accesses for SBSA UART (diff)
downloadlinux-dev-18900ca65a8553edc608b6c9d518eb31e6c09ba1.tar.xz
linux-dev-18900ca65a8553edc608b6c9d518eb31e6c09ba1.zip
tty: Replace TTY_IO_ERROR bit tests with tty_io_error()
Abstract TTY_IO_ERROR status test treewide with tty_io_error(). NB: tty->flags uses atomic bit ops; replace non-atomic bit test with test_bit(). Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/irda/ircomm/ircomm_tty.c')
-rw-r--r--net/irda/ircomm/ircomm_tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/ircomm/ircomm_tty.c b/net/irda/ircomm/ircomm_tty.c
index da126ee6d218..840b82f760ba 100644
--- a/net/irda/ircomm/ircomm_tty.c
+++ b/net/irda/ircomm/ircomm_tty.c
@@ -280,7 +280,7 @@ static int ircomm_tty_block_til_ready(struct ircomm_tty_cb *self,
* If non-blocking mode is set, or the port is not enabled,
* then make the check up front and then exit.
*/
- if (test_bit(TTY_IO_ERROR, &tty->flags)) {
+ if (tty_io_error(tty)) {
port->flags |= ASYNC_NORMAL_ACTIVE;
return 0;
}