diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
| commit | 7fbb8759eff9a348efa5f352ffaa51c364837c4b (patch) | |
| tree | d40cd3f47b9f667ba94d9613270132080dcb6a1a /drivers/char/amiserial.c | |
| parent | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into core/debug
Diffstat (limited to 'drivers/char/amiserial.c')
| -rw-r--r-- | drivers/char/amiserial.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c index 6e763e3f5a8..b97aebd7aeb 100644 --- a/drivers/char/amiserial.c +++ b/drivers/char/amiserial.c @@ -837,9 +837,6 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch) struct async_struct *info; unsigned long flags; - if (!tty) - return 0; - info = tty->driver_data; if (serial_paranoia_check(info, tty->name, "rs_put_char")) @@ -892,9 +889,6 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int count struct async_struct *info; unsigned long flags; - if (!tty) - return 0; - info = tty->driver_data; if (serial_paranoia_check(info, tty->name, "rs_write")) @@ -2077,12 +2071,13 @@ module_init(rs_init) module_exit(rs_exit) +#if defined(CONFIG_SERIAL_CONSOLE) && !defined(MODULE) + /* * ------------------------------------------------------------ * Serial console driver * ------------------------------------------------------------ */ -#ifdef CONFIG_SERIAL_CONSOLE static void amiga_serial_putc(char c) { @@ -2136,6 +2131,7 @@ static int __init amiserial_console_init(void) return 0; } console_initcall(amiserial_console_init); -#endif + +#endif /* CONFIG_SERIAL_CONSOLE && !MODULE */ MODULE_LICENSE("GPL"); |