diff options
| author | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-06-29 16:01:54 -0400 |
| commit | 55b4d6a52195a8f277ffddf755ddaff359878f41 (patch) | |
| tree | 06a3183a562f8da4688f65023f7a18dcad702956 /drivers/char/synclinkmp.c | |
| parent | adf8a287150667feb5747f8beade62acacc17d4e (diff) | |
| parent | 1f1332f727c3229eb2166a83fec5d3de6a73dce2 (diff) | |
Merge ../linus
Conflicts:
drivers/char/agp/Kconfig
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); |