aboutsummaryrefslogtreecommitdiffstats
path: root/tty.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-03 09:54:41 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-03 09:54:41 -0700
commit83801b53e2add123144953d9039b41d9378bce3b (patch)
tree225b35026dd89128e59eb494d75a5bb3709db66b /tty.current
parent34d977d7eb8d6f9061b4c7cae87093afc29f1a99 (diff)
downloadpatches-83801b53e2add123144953d9039b41d9378bce3b.tar.gz
2.6.34-rc6-git1 - delete a bunch of stuff now in Linus's tree
Diffstat (limited to 'tty.current')
-rw-r--r--tty.current/serial-8250_pnp-add-fujitsu-wacom-device.patch33
-rw-r--r--tty.current/serial-drivers-serial-pmac_zilog.c-add-missing-unlock.patch52
-rw-r--r--tty.current/tty-fix-regressions-in-the-char-driver-conversion.patch122
3 files changed, 0 insertions, 207 deletions
diff --git a/tty.current/serial-8250_pnp-add-fujitsu-wacom-device.patch b/tty.current/serial-8250_pnp-add-fujitsu-wacom-device.patch
deleted file mode 100644
index 8269d341a51279..00000000000000
--- a/tty.current/serial-8250_pnp-add-fujitsu-wacom-device.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From pingc@wacom.com Wed Apr 28 12:23:28 2010
-From: "Ping Cheng" <pingc@wacom.com>
-Date: Mon, 22 Mar 2010 13:40:29 -0700
-Subject: serial: 8250_pnp - add Fujitsu Wacom device
-To: <greg@kroah.com>
-Cc: <alan@lxorguk.ukuu.org.uk>, <jkosina@suse.cz>, <akpm@linux-foundation.org>
-Message-ID: <6753EB6004AFF34FAA275742C104F952BDD699@wacom-nt10.wacom.com>
-
-
-From: Ping Cheng <pingc@wacom.com>
-
-Add Fujitsu Wacom 1FGT Tablet PC device
-
-Signed-off-by: Ping Cheng <pingc@wacom.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.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
-@@ -348,6 +348,8 @@ static const struct pnp_device_id pnp_de
- { "FUJ02E6", 0 },
- /* Fujitsu Wacom 2FGT Tablet PC device */
- { "FUJ02E7", 0 },
-+ /* Fujitsu Wacom 1FGT Tablet PC device */
-+ { "FUJ02E9", 0 },
- /*
- * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
- * disguise)
diff --git a/tty.current/serial-drivers-serial-pmac_zilog.c-add-missing-unlock.patch b/tty.current/serial-drivers-serial-pmac_zilog.c-add-missing-unlock.patch
deleted file mode 100644
index 6cc3607740e531..00000000000000
--- a/tty.current/serial-drivers-serial-pmac_zilog.c-add-missing-unlock.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From akpm@linux-foundation.org Thu Apr 29 16:26:49 2010
-From: akpm@linux-foundation.org
-Date: Tue, 27 Apr 2010 14:05:20 -0700
-Subject: serial: drivers/serial/pmac_zilog.c: add missing unlock
-To: greg@kroah.com
-Cc: akpm@linux-foundation.org, julia@diku.dk, benh@kernel.crashing.org
-Message-ID: <201004272105.o3RL5K5u019632@imap1.linux-foundation.org>
-
-
-From: Julia Lawall <julia@diku.dk>
-
-In an error handling case the lock is not unlocked.
-
-A simplified version of the semantic patch that finds this problem is as
-follows: (http://coccinelle.lip6.fr/)
-
-// <smpl>
-@r exists@
-expression E1;
-identifier f;
-@@
-
-f (...) { <+...
-* spin_lock_irqsave (E1,...);
-... when != E1
-* return ...;
-...+> }
-// </smpl>
-
-Signed-off-by: Julia Lawall <julia@diku.dk>
-Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/serial/pmac_zilog.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/drivers/serial/pmac_zilog.c
-+++ b/drivers/serial/pmac_zilog.c
-@@ -752,8 +752,10 @@ static void pmz_break_ctl(struct uart_po
- uap->curregs[R5] = new_reg;
-
- /* NOTE: Not subject to 'transmitter active' rule. */
-- if (ZS_IS_ASLEEP(uap))
-+ if (ZS_IS_ASLEEP(uap)) {
-+ spin_unlock_irqrestore(&port->lock, flags);
- return;
-+ }
- write_zsreg(uap, R5, uap->curregs[R5]);
- }
-
diff --git a/tty.current/tty-fix-regressions-in-the-char-driver-conversion.patch b/tty.current/tty-fix-regressions-in-the-char-driver-conversion.patch
deleted file mode 100644
index 13b27b5125dc59..00000000000000
--- a/tty.current/tty-fix-regressions-in-the-char-driver-conversion.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From alan@linux.intel.com Fri Apr 23 16:42:51 2010
-From: Alan Cox <alan@linux.intel.com>
-Date: Fri, 23 Apr 2010 16:01:18 +0100
-Subject: tty: Fix regressions in the char driver conversion
-To: Jiri Slaby <jirislaby@gmail.com>
-Cc: Dan Carpenter <error27@gmail.com>, Andreas Pretzsch <apr@cn-eng.de>, Greg KH <gregkh@suse.de>
-Message-ID: <20100423160118.388dfe5e@linux.intel.com>
-
-This forgot to update a field in the old char drivers. The fact nobody
-has basically noticed (except one mxser user) rather suggests most of these
-drivers could go into the bitbucket.
-
-Signed-off-by: Alan Cox <alan@linux.intel.com>
-Cc: Jiri Slaby <jirislaby@gmail.com>
-Cc: Dan Carpenter <error27@gmail.com>
-Cc: Andreas Pretzsch <apr@cn-eng.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/char/isicom.c | 9 +++++++--
- drivers/char/istallion.c | 2 ++
- drivers/char/mxser.c | 3 ++-
- drivers/char/riscom8.c | 1 +
- drivers/char/stallion.c | 7 ++++---
- 5 files changed, 16 insertions(+), 6 deletions(-)
-
---- a/drivers/char/isicom.c
-+++ b/drivers/char/isicom.c
-@@ -879,8 +879,8 @@ static int isicom_open(struct tty_struct
- if (tport == NULL)
- return -ENODEV;
- port = container_of(tport, struct isi_port, port);
-- card = &isi_card[BOARD(tty->index)];
-
-+ tty->driver_data = port;
- return tty_port_open(tport, tty, filp);
- }
-
-@@ -936,7 +936,12 @@ static void isicom_shutdown(struct tty_p
- static void isicom_close(struct tty_struct *tty, struct file *filp)
- {
- struct isi_port *ip = tty->driver_data;
-- struct tty_port *port = &ip->port;
-+ struct tty_port *port;
-+
-+ if (ip == NULL)
-+ return;
-+
-+ port = &ip->port;
- if (isicom_paranoia_check(ip, tty->name, "isicom_close"))
- return;
- tty_port_close(port, tty, filp);
---- a/drivers/char/istallion.c
-+++ b/drivers/char/istallion.c
-@@ -827,6 +827,8 @@ static int stli_open(struct tty_struct *
- return -ENODEV;
- if (portp->devnr < 1)
- return -ENODEV;
-+
-+ tty->driver_data = portp;
- return tty_port_open(&portp->port, tty, filp);
- }
-
---- a/drivers/char/mxser.c
-+++ b/drivers/char/mxser.c
-@@ -1011,6 +1011,7 @@ static int mxser_open(struct tty_struct
- if (!info->ioaddr)
- return -ENODEV;
-
-+ tty->driver_data = info;
- return tty_port_open(&info->port, tty, filp);
- }
-
-@@ -1074,7 +1075,7 @@ static void mxser_close(struct tty_struc
- struct mxser_port *info = tty->driver_data;
- struct tty_port *port = &info->port;
-
-- if (tty->index == MXSER_PORTS)
-+ if (tty->index == MXSER_PORTS || info == NULL)
- return;
- if (tty_port_close_start(port, tty, filp) == 0)
- return;
---- a/drivers/char/riscom8.c
-+++ b/drivers/char/riscom8.c
-@@ -909,6 +909,7 @@ static int rc_open(struct tty_struct *tt
- if (error)
- return error;
-
-+ tty->driver_data = port;
- return tty_port_open(&port->port, tty, filp);
- }
-
---- a/drivers/char/stallion.c
-+++ b/drivers/char/stallion.c
-@@ -724,7 +724,6 @@ static int stl_open(struct tty_struct *t
- {
- struct stlport *portp;
- struct stlbrd *brdp;
-- struct tty_port *port;
- unsigned int minordev, brdnr, panelnr;
- int portnr;
-
-@@ -754,7 +753,8 @@ static int stl_open(struct tty_struct *t
- portp = brdp->panels[panelnr]->ports[portnr];
- if (portp == NULL)
- return -ENODEV;
-- port = &portp->port;
-+
-+ tty->driver_data = portp;
- return tty_port_open(&portp->port, tty, filp);
-
- }
-@@ -841,7 +841,8 @@ static void stl_close(struct tty_struct
- pr_debug("stl_close(tty=%p,filp=%p)\n", tty, filp);
-
- portp = tty->driver_data;
-- BUG_ON(portp == NULL);
-+ if(portp == NULL)
-+ return;
- tty_port_close(&portp->port, tty, filp);
- }
-
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:56 +0000