diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 21:58:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-02 21:58:16 +0100 |
| commit | eed5ee1a3ab3020168cd67fdde2500452b0628c9 (patch) | |
| tree | 9548c5a4851b1a1e832b7800baf1e72b33bc7a66 /drivers/net | |
| parent | Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gre... (diff) | |
| parent | serial: mfd: adjust the baud rate setting (diff) | |
| download | linux-eed5ee1a3ab3020168cd67fdde2500452b0628c9.tar.xz linux-eed5ee1a3ab3020168cd67fdde2500452b0628c9.zip | |
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')
| -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) if (err) return err; /* Done. We have linked the TTY line to a channel. */ - return sl->dev->base_addr; + return 0; } |