diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-15 12:15:23 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-01-15 12:15:23 -0800 |
| commit | d8090ba7e175e4c220bd0027e9631d0116891ce0 (patch) | |
| tree | b8cc5b4a4a4a760e85710e74c3010dedf9367813 /tty.current | |
| parent | 2b0ec05ccfa354c1ecf71a59d1fe887abe78d97e (diff) | |
| download | patches-d8090ba7e175e4c220bd0027e9631d0116891ce0.tar.gz | |
lots of usb patches
Diffstat (limited to 'tty.current')
3 files changed, 128 insertions, 0 deletions
diff --git a/tty.current/nozomi-quick-fix-for-the-close-close-bug.patch b/tty.current/nozomi-quick-fix-for-the-close-close-bug.patch new file mode 100644 index 00000000000000..c74d3dbe8fd484 --- /dev/null +++ b/tty.current/nozomi-quick-fix-for-the-close-close-bug.patch @@ -0,0 +1,48 @@ +From alan@linux.intel.com Fri Jan 15 10:58:59 2010 +From: Alan Cox <alan@linux.intel.com> +Date: Mon, 04 Jan 2010 16:26:50 +0000 +Subject: nozomi: quick fix for the close/close bug +To: greg@kroah.com, linux-serial@vger.kernel.org +Message-ID: <20100104162650.17194.17161.stgit@localhost.localdomain> + + +Nozomi goes wrong if you get the sequence + + open + open + close + + [stuff] + close + +which turns out to occur on some ppp type setups. + +This is a quick patch up for the problem. It's not really fixing Nozomi +which completely fails to implement tty open/close semantics and all the +other needed stuff. Doing it right is a rather more invasive patch set and +not one that will backport. + + + +Signed-off-by: Alan Cox <alan@linux.intel.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/char/nozomi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/char/nozomi.c ++++ b/drivers/char/nozomi.c +@@ -1651,10 +1651,10 @@ static void ntty_close(struct tty_struct + + dc->open_ttys--; + port->count--; +- tty_port_tty_set(port, NULL); + + if (port->count == 0) { + DBG1("close: %d", nport->token_dl); ++ tty_port_tty_set(port, NULL); + spin_lock_irqsave(&dc->spin_mutex, flags); + dc->last_ier &= ~(nport->token_dl); + writew(dc->last_ier, dc->reg_ier); diff --git a/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch b/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch new file mode 100644 index 00000000000000..c343d6f0bcf8da --- /dev/null +++ b/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch @@ -0,0 +1,31 @@ +From pinglinux@gmail.com Fri Jan 15 11:03:03 2010 +From: Ping <pinglinux@gmail.com> +Date: Thu, 7 Jan 2010 16:49:59 -0800 +Subject: serial/8250_pnp: Add a new Fujitsu Wacom Tablet PC device +To: Andrew Morton <akpm@linux-foundation.org> +Cc: alan@lxorguk.ukuu.org.uk, greg@kroah.com, jkosina@suse.cz, mjg59@srcf.ucam.org, mjg@redhat.com +Message-ID: <167e8a331001071649l3d8df335w2b2422984bb245e8@mail.gmail.com> + +From: Ping Cheng <pingc@wacom.com> + +This is a new two finger touch Fujitsu Wacom Tablet PC + +Signed-off-by: Ping Cheng <pingc@wacom.com> +Cc: stable <stable@kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/serial/8250_pnp.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/serial/8250_pnp.c ++++ b/drivers/serial/8250_pnp.c +@@ -354,6 +354,8 @@ static const struct pnp_device_id pnp_de + { "FUJ02E5", 0 }, + /* Fujitsu P-series tablet PC device */ + { "FUJ02E6", 0 }, ++ /* Fujitsu Wacom 2FGT Tablet PC device */ ++ { "FUJ02E7", 0 }, + /* + * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in + * disguise) diff --git a/tty.current/serial-fix-crash-if-the-minimum-rate-of-the-device-is-9600-baud.patch b/tty.current/serial-fix-crash-if-the-minimum-rate-of-the-device-is-9600-baud.patch new file mode 100644 index 00000000000000..d9bb6be0a7ad95 --- /dev/null +++ b/tty.current/serial-fix-crash-if-the-minimum-rate-of-the-device-is-9600-baud.patch @@ -0,0 +1,49 @@ +From alan@linux.intel.com Fri Jan 15 10:58:40 2010 +From: Alan Cox <alan@linux.intel.com> +Date: Mon, 04 Jan 2010 16:26:21 +0000 +Subject: serial: Fix crash if the minimum rate of the device is > 9600 baud +To: greg@kroah.com, linux-serial@vger.kernel.org +Message-ID: <20100104162557.17151.23761.stgit@localhost.localdomain> + + +In that situation if the old rate is invalid and the new rate is invalid +and the chip cannot do 9600 baud we report zero, which makes all the +drivers explode. + +Instead force the rate based on min/max + +Signed-off-by: Alan Cox <alan@linux.intel.com> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/serial/serial_core.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) + +--- a/drivers/serial/serial_core.c ++++ b/drivers/serial/serial_core.c +@@ -385,13 +385,20 @@ uart_get_baud_rate(struct uart_port *por + } + + /* +- * As a last resort, if the quotient is zero, +- * default to 9600 bps ++ * As a last resort, if the range cannot be met then clip to ++ * the nearest chip supported rate. + */ +- if (!hung_up) +- tty_termios_encode_baud_rate(termios, 9600, 9600); ++ if (!hung_up) { ++ if (baud <= min) ++ tty_termios_encode_baud_rate(termios, ++ min + 1, min + 1); ++ else ++ tty_termios_encode_baud_rate(termios, ++ max - 1, max - 1); ++ } + } +- ++ /* Should never happen */ ++ WARN_ON(1); + return 0; + } + |