diff options
| author | Patrick McHardy <kaber@trash.net> | 2011-04-13 13:32:28 +0200 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2011-04-13 13:32:28 +0200 |
| commit | b32e3dc7860d00124fa432dba09667e647cb9bcc (patch) | |
| tree | 2fa6e56f389431dfb84609d3d7572cad76e88e71 /drivers/staging/tty/specialix.c | |
| parent | 6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff) | |
| parent | 96120d86fe302c006259baee9061eea9e1b9e486 (diff) | |
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'drivers/staging/tty/specialix.c')
| -rw-r--r-- | drivers/staging/tty/specialix.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/tty/specialix.c b/drivers/staging/tty/specialix.c index 47e5753f732..17a1be536a4 100644 --- a/drivers/staging/tty/specialix.c +++ b/drivers/staging/tty/specialix.c @@ -1416,7 +1416,7 @@ static int sx_open(struct tty_struct *tty, struct file *filp) board, bp, port, SX_PORT(tty->index)); if (sx_paranoia_check(port, tty->name, "sx_open")) { - func_enter(); + func_exit(); return -ENODEV; } @@ -1435,13 +1435,13 @@ static int sx_open(struct tty_struct *tty, struct file *filp) error = sx_setup_port(bp, port); if (error) { - func_enter(); + func_exit(); return error; } error = block_til_ready(tty, filp, port); if (error) { - func_enter(); + func_exit(); return error; } @@ -1860,7 +1860,7 @@ static int sx_set_serial_info(struct specialix_port *port, func_enter(); if (copy_from_user(&tmp, newinfo, sizeof(tmp))) { - func_enter(); + func_exit(); return -EFAULT; } |