diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-06-26 01:31:38 -0400 |
| commit | 4854c7b27f0975a2b629f35ea3996d2968eb7c4f (patch) | |
| tree | 4102bdb70289764a2058aff0f907b13d7cf0e0d1 /drivers/char/synclinkmp.c | |
| parent | 3cbd5b32cb625f5c0f1b1476d154fac873dd49ce (diff) | |
| parent | fcc18e83e1f6fd9fa6b333735bf0fcd530655511 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/char/synclinkmp.c')
| -rw-r--r-- | drivers/char/synclinkmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/synclinkmp.c b/drivers/char/synclinkmp.c index 858740131115..21bf15ad9980 100644 --- a/drivers/char/synclinkmp.c +++ b/drivers/char/synclinkmp.c | |||
| @@ -988,7 +988,7 @@ static int write(struct tty_struct *tty, | |||
| 988 | if (sanity_check(info, tty->name, "write")) | 988 | if (sanity_check(info, tty->name, "write")) |
| 989 | goto cleanup; | 989 | goto cleanup; |
| 990 | 990 | ||
| 991 | if (!tty || !info->tx_buf) | 991 | if (!info->tx_buf) |
| 992 | goto cleanup; | 992 | goto cleanup; |
| 993 | 993 | ||
| 994 | if (info->params.mode == MGSL_MODE_HDLC) { | 994 | if (info->params.mode == MGSL_MODE_HDLC) { |
| @@ -1067,7 +1067,7 @@ static void put_char(struct tty_struct *tty, unsigned char ch) | |||
| 1067 | if (sanity_check(info, tty->name, "put_char")) | 1067 | if (sanity_check(info, tty->name, "put_char")) |
| 1068 | return; | 1068 | return; |
| 1069 | 1069 | ||
| 1070 | if (!tty || !info->tx_buf) | 1070 | if (!info->tx_buf) |
| 1071 | return; | 1071 | return; |
| 1072 | 1072 | ||
| 1073 | spin_lock_irqsave(&info->lock,flags); | 1073 | spin_lock_irqsave(&info->lock,flags); |