Commit 779185b6 authored by Andris Pavenis's avatar Andris Pavenis Committed by Linus Torvalds

[PATCH] Bug in tty_io.c after changes between 2.6.9-rc1-bk1 and 2.6.9-rc1-bk2

Fix http://bugzilla.kernel.org/show_bug.cgi?id=3736

Finally located that a problem seems to be a simple typo.
Acked-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9e20a60d
...@@ -1156,8 +1156,8 @@ static inline void pty_line_name(struct tty_driver *driver, int index, char *p) ...@@ -1156,8 +1156,8 @@ static inline void pty_line_name(struct tty_driver *driver, int index, char *p)
int i = index + driver->name_base; int i = index + driver->name_base;
/* ->name is initialized to "ttyp", but "tty" is expected */ /* ->name is initialized to "ttyp", but "tty" is expected */
sprintf(p, "%s%c%x", sprintf(p, "%s%c%x",
driver->subtype == PTY_TYPE_SLAVE ? "tty" : driver->name, driver->subtype == PTY_TYPE_SLAVE ? "pty" : driver->name,
ptychar[i >> 4 & 0xf], i & 0xf); ptychar[i >> 4 & 0xf], i & 0xf);
} }
static inline void tty_line_name(struct tty_driver *driver, int index, char *p) static inline void tty_line_name(struct tty_driver *driver, int index, char *p)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment