diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 15:58:16 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 15:58:16 -0500 |
| commit | eed5ee1a3ab3020168cd67fdde2500452b0628c9 (patch) | |
| tree | 9548c5a4851b1a1e832b7800baf1e72b33bc7a66 /drivers/net/wan | |
| parent | 435a5aebf609624bdf7c5a9a7705c260d0076195 (diff) | |
| parent | a5880a9e5bb40fbae55de60051d69a29091053c3 (diff) | |
Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
serial: mfd: adjust the baud rate setting
TTY: open/hangup race fixup
TTY: don't allow reopen when ldisc is changing
NET: wan/x25, fix ldisc->open retval
TTY: ldisc, fix open flag handling
serial8250: Mark console as CON_ANYTIME
Diffstat (limited to 'drivers/net/wan')
| -rw-r--r-- | drivers/net/wan/x25_asy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index cf05504d9511..24297b274cd4 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
| @@ -577,7 +577,7 @@ static int x25_asy_open_tty(struct tty_struct *tty) | |||
| 577 | if (err) | 577 | if (err) |
| 578 | return err; | 578 | return err; |
| 579 | /* Done. We have linked the TTY line to a channel. */ | 579 | /* Done. We have linked the TTY line to a channel. */ |
| 580 | return sl->dev->base_addr; | 580 | return 0; |
| 581 | } | 581 | } |
| 582 | 582 | ||
| 583 | 583 | ||