aboutsummaryrefslogtreecommitdiffstats
path: root/usb.current
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-04-07 10:03:18 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-07 10:03:18 -0700
commit8ed491e1d162e90f33cfcd12b8017e739234aad9 (patch)
treedc1dad0b17f70daf342db970ae44d671110f46c5 /usb.current
parentb4a8f06022ecf4c5c279a61de89a1d3758e08e0e (diff)
downloadpatches-8ed491e1d162e90f33cfcd12b8017e739234aad9.tar.gz
remove 3 patches now in mainline
Diffstat (limited to 'usb.current')
-rw-r--r--usb.current/usb-cdc-acm-zydas-1602-identifier-needed.patch31
-rw-r--r--usb.current/usb-symbol-remove-various-bits-of-left-over-junk.patch112
-rw-r--r--usb.current/usb-tty-pl2303-needs-identifiers-for-siemens-s81-as-well-as-ef81.patch41
3 files changed, 0 insertions, 184 deletions
diff --git a/usb.current/usb-cdc-acm-zydas-1602-identifier-needed.patch b/usb.current/usb-cdc-acm-zydas-1602-identifier-needed.patch
deleted file mode 100644
index ac555bc23959d2..00000000000000
--- a/usb.current/usb-cdc-acm-zydas-1602-identifier-needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From alan@lxorguk.ukuu.org.uk Mon Apr 6 12:12:24 2009
-From: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Date: Thu, 26 Mar 2009 20:50:02 +0000
-Subject: USB: cdc-acm: zydas 1602 identifier needed
-To: greg@kroah.com
-Message-ID: <20090326204959.5020.80841.stgit@localhost.localdomain>
-
-
-Bugzilla #9095 and a couple of other confirmations
-
-Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
-
----
- drivers/usb/class/cdc-acm.c | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -1358,6 +1358,9 @@ static struct usb_device_id acm_ids[] =
- { USB_DEVICE(0x079b, 0x000f), /* BT On-Air USB MODEM */
- .driver_info = NO_UNION_NORMAL, /* has no union descriptor */
- },
-+ { USB_DEVICE(0x0ace, 0x1602), /* ZyDAS 56K USB MODEM */
-+ .driver_info = SINGLE_RX_URB,
-+ },
- { USB_DEVICE(0x0ace, 0x1608), /* ZyDAS 56K USB MODEM */
- .driver_info = SINGLE_RX_URB, /* firmware bug */
- },
diff --git a/usb.current/usb-symbol-remove-various-bits-of-left-over-junk.patch b/usb.current/usb-symbol-remove-various-bits-of-left-over-junk.patch
deleted file mode 100644
index a16e4156c5b1cf..00000000000000
--- a/usb.current/usb-symbol-remove-various-bits-of-left-over-junk.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-From alan@lxorguk.ukuu.org.uk Mon Apr 6 12:16:20 2009
-From: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Date: Wed, 01 Apr 2009 14:59:17 +0100
-Subject: USB: symbol: Remove various bits of left over junk
-To: torvalds@linux-foundation.org, greg@kroah.com
-Message-ID: <20090401135903.22486.60017.stgit@localhost.localdomain>
-
-
-There are various bits of code here that are unfinished and instead of
-being harmless either confuse or spew stuff into the logs at higher than
-debug level. They can and should go away.
-
-Also remove the bogus use of tty->lowlatency. We fixed the need for this hack
-long ago (with the flip buffer rewrite) but people keep copying it into drivers.
-
-Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/symbolserial.c | 67 --------------------------------------
- 1 file changed, 67 deletions(-)
-
---- a/drivers/usb/serial/symbolserial.c
-+++ b/drivers/usb/serial/symbolserial.c
-@@ -139,14 +139,6 @@ static int symbol_open(struct tty_struct
- priv->port = port;
- spin_unlock_irqrestore(&priv->lock, flags);
-
-- /*
-- * Force low_latency on so that our tty_push actually forces the data
-- * through, otherwise it is scheduled, and with high data rates (like
-- * with OHCI) data can get lost.
-- */
-- if (tty)
-- tty->low_latency = 1;
--
- /* Start reading from the device */
- usb_fill_int_urb(priv->int_urb, priv->udev,
- usb_rcvintpipe(priv->udev, priv->int_address),
-@@ -205,62 +197,6 @@ static void symbol_unthrottle(struct tty
- __func__, result);
- }
-
--static int symbol_ioctl(struct tty_struct *tty, struct file *file,
-- unsigned int cmd, unsigned long arg)
--{
-- struct usb_serial_port *port = tty->driver_data;
-- struct device *dev = &port->dev;
--
-- /*
-- * Right now we need to figure out what commands
-- * most userspace tools want to see for this driver,
-- * so just log the things.
-- */
-- switch (cmd) {
-- case TIOCSERGETLSR:
-- dev_info(dev, "%s: TIOCSERGETLSR\n", __func__);
-- break;
--
-- case TIOCGSERIAL:
-- dev_info(dev, "%s: TIOCGSERIAL\n", __func__);
-- break;
--
-- case TIOCMIWAIT:
-- dev_info(dev, "%s: TIOCMIWAIT\n", __func__);
-- break;
--
-- case TIOCGICOUNT:
-- dev_info(dev, "%s: TIOCGICOUNT\n", __func__);
-- break;
-- default:
-- dev_info(dev, "%s: unknown (%d)\n", __func__, cmd);
-- }
-- return -ENOIOCTLCMD;
--}
--
--static int symbol_tiocmget(struct tty_struct *tty, struct file *file)
--{
-- struct usb_serial_port *port = tty->driver_data;
-- struct device *dev = &port->dev;
--
-- /* TODO */
-- /* probably just need to shadow whatever was sent to us here */
-- dev_info(dev, "%s\n", __func__);
-- return 0;
--}
--
--static int symbol_tiocmset(struct tty_struct *tty, struct file *file,
-- unsigned int set, unsigned int clear)
--{
-- struct usb_serial_port *port = tty->driver_data;
-- struct device *dev = &port->dev;
--
-- /* TODO */
-- /* probably just need to shadow whatever was sent to us here */
-- dev_info(dev, "%s\n", __func__);
-- return 0;
--}
--
- static int symbol_startup(struct usb_serial *serial)
- {
- struct symbol_private *priv;
-@@ -367,9 +303,6 @@ static struct usb_serial_driver symbol_d
- .shutdown = symbol_shutdown,
- .throttle = symbol_throttle,
- .unthrottle = symbol_unthrottle,
-- .ioctl = symbol_ioctl,
-- .tiocmget = symbol_tiocmget,
-- .tiocmset = symbol_tiocmset,
- };
-
- static int __init symbol_init(void)
diff --git a/usb.current/usb-tty-pl2303-needs-identifiers-for-siemens-s81-as-well-as-ef81.patch b/usb.current/usb-tty-pl2303-needs-identifiers-for-siemens-s81-as-well-as-ef81.patch
deleted file mode 100644
index 910dc6e6336b22..00000000000000
--- a/usb.current/usb-tty-pl2303-needs-identifiers-for-siemens-s81-as-well-as-ef81.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From alan@lxorguk.ukuu.org.uk Mon Apr 6 12:12:52 2009
-From: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Date: Thu, 26 Mar 2009 20:50:46 +0000
-Subject: USB: tty: pl2303 needs identifiers for Siemens S81 as well as EF81
-To: greg@kroah.com
-Message-ID: <20090326205020.5084.87043.stgit@localhost.localdomain>
-
-
-Closes bug 9065
-
-Signed-off-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/usb/serial/pl2303.c | 1 +
- drivers/usb/serial/pl2303.h | 4 ++++
- 2 files changed, 5 insertions(+)
-
---- a/drivers/usb/serial/pl2303.c
-+++ b/drivers/usb/serial/pl2303.c
-@@ -79,6 +79,7 @@ static struct usb_device_id id_table []
- { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X65) },
- { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_X75) },
- { USB_DEVICE(SIEMENS_VENDOR_ID, SIEMENS_PRODUCT_ID_EF81) },
-+ { USB_DEVICE(BENQ_VENDOR_ID, BENQ_PRODUCT_ID_S81) }, /* Benq/Siemens S81 */
- { USB_DEVICE(SYNTECH_VENDOR_ID, SYNTECH_PRODUCT_ID) },
- { USB_DEVICE(NOKIA_CA42_VENDOR_ID, NOKIA_CA42_PRODUCT_ID) },
- { USB_DEVICE(CA_42_CA42_VENDOR_ID, CA_42_CA42_PRODUCT_ID) },
---- a/drivers/usb/serial/pl2303.h
-+++ b/drivers/usb/serial/pl2303.h
-@@ -7,6 +7,10 @@
- * (at your option) any later version.
- *
- */
-+
-+#define BENQ_VENDOR_ID 0x04a5
-+#define BENQ_PRODUCT_ID_S81 0x4027
-+
- #define PL2303_VENDOR_ID 0x067b
- #define PL2303_PRODUCT_ID 0x2303
- #define PL2303_PRODUCT_ID_RSAQ2 0x04bb