diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-12 17:53:34 +1000 |
| commit | 7a0c58d0513c246ac5438ef4a55ce8b93395ae0e (patch) | |
| tree | d18f58349ced242aa62e622e381e60933f71d451 /drivers/char | |
| parent | 6218a761bbc27acc65248c80024875bcc06d52b1 (diff) | |
| parent | 289a1e995e74734b5ec76ca8a5490058f4fecc24 (diff) | |
| download | linux-3.10-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.gz linux-3.10-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.tar.bz2 linux-3.10-7a0c58d0513c246ac5438ef4a55ce8b93395ae0e.zip | |
Merge branch 'merge'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/Makefile | 2 | ||||
| -rw-r--r-- | drivers/char/n_tty.c | 4 | ||||
| -rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index f5b01c6d498..fb919bfb282 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -41,9 +41,9 @@ obj-$(CONFIG_N_HDLC) += n_hdlc.o obj-$(CONFIG_AMIGA_BUILTIN_SERIAL) += amiserial.o obj-$(CONFIG_SX) += sx.o generic_serial.o obj-$(CONFIG_RIO) += rio/ generic_serial.o -obj-$(CONFIG_HVC_DRIVER) += hvc_console.o obj-$(CONFIG_HVC_CONSOLE) += hvc_vio.o hvsi.o obj-$(CONFIG_HVC_RTAS) += hvc_rtas.o +obj-$(CONFIG_HVC_DRIVER) += hvc_console.o obj-$(CONFIG_RAW_DRIVER) += raw.o obj-$(CONFIG_SGI_SNSC) += snsc.o snsc_event.o obj-$(CONFIG_MMTIMER) += mmtimer.o diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index ede365d0538..b9371d5bf79 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c @@ -1384,8 +1384,10 @@ do_it_again: * longer than TTY_THRESHOLD_UNTHROTTLE in canonical mode, * we won't get any more characters. */ - if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) + if (n_tty_chars_in_buffer(tty) <= TTY_THRESHOLD_UNTHROTTLE) { + n_tty_set_room(tty); check_unthrottle(tty); + } if (b - buf >= minimum) break; diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 128b2632512..eab5394da66 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c @@ -149,7 +149,7 @@ struct cm4000_dev { #define ZERO_DEV(dev) \ memset(&dev->atr_csum,0, \ sizeof(struct cm4000_dev) - \ - /*link*/ sizeof(struct pcmcia_device) - \ + /*link*/ sizeof(struct pcmcia_device *) - \ /*node*/ sizeof(dev_node_t) - \ /*atr*/ MAX_ATR*sizeof(char) - \ /*rbuf*/ 512*sizeof(char) - \ |