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/esp.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/esp.c')
| -rw-r--r-- | drivers/char/esp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/esp.c b/drivers/char/esp.c index 09dc4b01232c..922174d527ae 100644 --- a/drivers/char/esp.c +++ b/drivers/char/esp.c | |||
| @@ -1212,7 +1212,7 @@ static void rs_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 1212 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) | 1212 | if (serial_paranoia_check(info, tty->name, "rs_put_char")) |
| 1213 | return; | 1213 | return; |
| 1214 | 1214 | ||
| 1215 | if (!tty || !info->xmit_buf) | 1215 | if (!info->xmit_buf) |
| 1216 | return; | 1216 | return; |
| 1217 | 1217 | ||
| 1218 | spin_lock_irqsave(&info->lock, flags); | 1218 | spin_lock_irqsave(&info->lock, flags); |
| @@ -1256,7 +1256,7 @@ static int rs_write(struct tty_struct * tty, | |||
| 1256 | if (serial_paranoia_check(info, tty->name, "rs_write")) | 1256 | if (serial_paranoia_check(info, tty->name, "rs_write")) |
| 1257 | return 0; | 1257 | return 0; |
| 1258 | 1258 | ||
| 1259 | if (!tty || !info->xmit_buf) | 1259 | if (!info->xmit_buf) |
| 1260 | return 0; | 1260 | return 0; |
| 1261 | 1261 | ||
| 1262 | while (1) { | 1262 | while (1) { |