aboutsummaryrefslogtreecommitdiffstats
path: root/tty.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-09-29 11:38:32 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-29 11:38:32 -0700
commit94f7cef50ccb7114176ad7817035754209d8cd7a (patch)
tree5e88676ac073f45444f308a7636057131aa77f50 /tty.current
parentc8caa38a824215b4850e26af6ef808aea35b67fd (diff)
downloadpatches-94f7cef50ccb7114176ad7817035754209d8cd7a.tar.gz
remove tty patches now upstream
Diffstat (limited to 'tty.current')
-rw-r--r--tty.current/serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch39
-rw-r--r--tty.current/tty-gigaset-really-fix-chars_in_buffer.patch68
-rw-r--r--tty.current/tty-serial-pcmcia-add-id-for-advantech-card.patch32
3 files changed, 0 insertions, 139 deletions
diff --git a/tty.current/serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch b/tty.current/serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch
deleted file mode 100644
index ba1e4fabd1a42f..00000000000000
--- a/tty.current/serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From akpm@linux-foundation.org Fri Aug 7 13:40:43 2009
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 06 Aug 2009 15:20:05 -0700
-Subject: serial: bfin_5xx: fix building as module when early printk is enabled
-To: alan@lxorguk.ukuu.org.uk
-Cc: akpm@linux-foundation.org, vapier@gentoo.org, stable@kernel.org
-Message-ID: <200908062220.n76MK6tf025496@imap1.linux-foundation.org>
-
-
-From: Mike Frysinger <vapier@gentoo.org>
-
-Since early printk only makes sense/works when the serial driver is built
-into the kernel, disable the option for this driver when it is going to be
-built as a module. Otherwise we get build failures due to the ifdef
-handling.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
-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/bfin_5xx.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- a/drivers/serial/bfin_5xx.c
-+++ b/drivers/serial/bfin_5xx.c
-@@ -42,6 +42,10 @@
- # undef CONFIG_EARLY_PRINTK
- #endif
-
-+#ifdef CONFIG_SERIAL_BFIN_MODULE
-+# undef CONFIG_EARLY_PRINTK
-+#endif
-+
- /* UART name and device definitions */
- #define BFIN_SERIAL_NAME "ttyBF"
- #define BFIN_SERIAL_MAJOR 204
diff --git a/tty.current/tty-gigaset-really-fix-chars_in_buffer.patch b/tty.current/tty-gigaset-really-fix-chars_in_buffer.patch
deleted file mode 100644
index 87c526362423b3..00000000000000
--- a/tty.current/tty-gigaset-really-fix-chars_in_buffer.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From akpm@linux-foundation.org Fri Aug 7 13:39:52 2009
-From: Tilman Schmidt <tilman@imap.cc>
-Date: Thu, 06 Aug 2009 20:33:33 -0700
-Subject: tty: gigaset: really fix chars_in_buffer
-To: greg@kroah.com
-Cc: akpm@linux-foundation.org, tilman@imap.cc, davem@davemloft.net
-Message-ID: <200908070333.n773XXDo001081@imap1.linux-foundation.org>
-
-
-From: Tilman Schmidt <tilman@imap.cc>
-
-The tty_operation chars_in_buffer() is not allowed to return a negative
-value to signal an error. Corrects the problem flagged by commit
-23198fda7182969b619613a555f8645fdc3dc334, "tty: fix chars_in_buffers".
-
-Signed-off-by: Tilman Schmidt <tilman@imap.cc>
-Cc: "David S. Miller" <davem@davemloft.net>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
----
-
- drivers/isdn/gigaset/interface.c | 19 +++++++------------
- 1 file changed, 7 insertions(+), 12 deletions(-)
-
---- a/drivers/isdn/gigaset/interface.c
-+++ b/drivers/isdn/gigaset/interface.c
-@@ -408,33 +408,28 @@ static int if_write_room(struct tty_stru
- return retval;
- }
-
--/* FIXME: This function does not have error returns */
--
- static int if_chars_in_buffer(struct tty_struct *tty)
- {
- struct cardstate *cs;
-- int retval = -ENODEV;
-+ int retval = 0;
-
- cs = (struct cardstate *) tty->driver_data;
- if (!cs) {
- pr_err("%s: no cardstate\n", __func__);
-- return -ENODEV;
-+ return 0;
- }
-
- gig_dbg(DEBUG_IF, "%u: %s()", cs->minor_index, __func__);
-
-- if (mutex_lock_interruptible(&cs->mutex))
-- return -ERESTARTSYS; // FIXME -EINTR?
-+ mutex_lock(&cs->mutex);
-
-- if (!cs->connected) {
-+ if (!cs->connected)
- gig_dbg(DEBUG_IF, "not connected");
-- retval = -ENODEV;
-- } else if (!cs->open_count)
-+ else if (!cs->open_count)
- dev_warn(cs->dev, "%s: device not opened\n", __func__);
-- else if (cs->mstate != MS_LOCKED) {
-+ else if (cs->mstate != MS_LOCKED)
- dev_warn(cs->dev, "can't write to unlocked device\n");
-- retval = -EBUSY;
-- } else
-+ else
- retval = cs->ops->chars_in_buffer(cs);
-
- mutex_unlock(&cs->mutex);
diff --git a/tty.current/tty-serial-pcmcia-add-id-for-advantech-card.patch b/tty.current/tty-serial-pcmcia-add-id-for-advantech-card.patch
deleted file mode 100644
index 71cf9282a1008d..00000000000000
--- a/tty.current/tty-serial-pcmcia-add-id-for-advantech-card.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From w.sang@pengutronix.de Tue Aug 18 09:50:34 2009
-From: Wolfram Sang <w.sang@pengutronix.de>
-Date: Sat, 1 Aug 2009 15:28:35 +0200
-Subject: tty: serial/pcmcia: add ID for Advantech card
-To: linux-serial@vger.kernel.org
-Cc: linux-pcmcia@lists.infradead.org, KMoorman@transy.edu, Wolfram Sang <w.sang@pengutronix.de>, Greg KH <gregkh@suse.de>
-Message-ID: <1249133315-21142-1-git-send-email-w.sang@pengutronix.de>
-
-
-Add ID as reported in:
-
-http://lists.infradead.org/pipermail/linux-pcmcia/2009-May/006127.html
-
-Reported-by: Kenneth Moorman <KMoorman@transy.edu>
-Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/serial/serial_cs.c | 1 +
- 1 file changed, 1 insertion(+)
-
---- a/drivers/serial/serial_cs.c
-+++ b/drivers/serial/serial_cs.c
-@@ -884,6 +884,7 @@ static struct pcmcia_device_id serial_id
- PCMCIA_DEVICE_CIS_MANF_CARD(0x0192, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- pre update */
- PCMCIA_DEVICE_CIS_MANF_CARD(0x013f, 0xa555, "SW_555_SER.cis"), /* Sierra Aircard 555 CDMA 1xrtt Modem -- post update */
- PCMCIA_DEVICE_CIS_PROD_ID12("MultiTech", "PCMCIA 56K DataFax", 0x842047ee, 0xc2efcf03, "cis/MT5634ZLX.cis"),
-+ PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-2", 0x96913a85, 0x27ab5437, "COMpad2.cis"),
- PCMCIA_DEVICE_CIS_PROD_ID12("ADVANTECH", "COMpad-32/85B-4", 0x96913a85, 0xcec8f102, "COMpad4.cis"),
- PCMCIA_DEVICE_CIS_PROD_ID123("ADVANTECH", "COMpad-32/85", "1.0", 0x96913a85, 0x8fbe92ae, 0x0877b627, "COMpad2.cis"),
- PCMCIA_DEVICE_CIS_PROD_ID2("RS-COM 2P", 0xad20b156, "cis/RS-COM-2P.cis"),
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 21:00:49 +0000