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/cyclades.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/cyclades.c')
| -rw-r--r-- | drivers/char/cyclades.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index cc7acf877dc0..122e7a72a4e1 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
| @@ -2833,9 +2833,8 @@ cy_write(struct tty_struct * tty, const unsigned char *buf, int count) | |||
| 2833 | return 0; | 2833 | return 0; |
| 2834 | } | 2834 | } |
| 2835 | 2835 | ||
| 2836 | if (!tty || !info->xmit_buf || !tmp_buf){ | 2836 | if (!info->xmit_buf || !tmp_buf) |
| 2837 | return 0; | 2837 | return 0; |
| 2838 | } | ||
| 2839 | 2838 | ||
| 2840 | CY_LOCK(info, flags); | 2839 | CY_LOCK(info, flags); |
| 2841 | while (1) { | 2840 | while (1) { |
| @@ -2884,7 +2883,7 @@ cy_put_char(struct tty_struct *tty, unsigned char ch) | |||
| 2884 | if (serial_paranoia_check(info, tty->name, "cy_put_char")) | 2883 | if (serial_paranoia_check(info, tty->name, "cy_put_char")) |
| 2885 | return; | 2884 | return; |
| 2886 | 2885 | ||
| 2887 | if (!tty || !info->xmit_buf) | 2886 | if (!info->xmit_buf) |
| 2888 | return; | 2887 | return; |
| 2889 | 2888 | ||
| 2890 | CY_LOCK(info, flags); | 2889 | CY_LOCK(info, flags); |