aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 14:14:43 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-04-26 14:14:43 -0700
commita11a585b76abca29967679c5390999cd25486fb6 (patch)
tree063de60e0df13385624a7f252c5cdcf707b6d308 /usb
parent06d408d7f2da2afd8e6c08f5aef681b3179bc822 (diff)
downloadpatches-a11a585b76abca29967679c5390999cd25486fb6.tar.gz
more patches
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-musb-set-transceiver-interface-type.patch2
-rw-r--r--usb/usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch2
-rw-r--r--usb/usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch2
-rw-r--r--usb/usb-pl2303-switch-to-generic-read-implementation.patch8
-rw-r--r--usb/usb-pl2303-switch-to-generic-write-implementation.patch18
-rw-r--r--usb/usb-pl2303-use-generic-close.patch2
-rw-r--r--usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch2
7 files changed, 18 insertions, 18 deletions
diff --git a/usb/usb-musb-set-transceiver-interface-type.patch b/usb/usb-musb-set-transceiver-interface-type.patch
index 5d12feb0679e60..86faec21737198 100644
--- a/usb/usb-musb-set-transceiver-interface-type.patch
+++ b/usb/usb-musb-set-transceiver-interface-type.patch
@@ -107,7 +107,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
pr_debug("HS USB OTG: revision 0x%x, sysconfig 0x%02x, "
--- a/drivers/usb/musb/tusb6010.c
+++ b/drivers/usb/musb/tusb6010.c
-@@ -1091,7 +1091,7 @@ err:
+@@ -1104,7 +1104,7 @@ err:
return -ENODEV;
}
diff --git a/usb/usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch b/usb/usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch
index cae75080d47992..b84b9e0526be45 100644
--- a/usb/usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch
+++ b/usb/usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
-@@ -1169,6 +1169,7 @@ static struct usb_serial_driver pl2303_d
+@@ -1170,6 +1170,7 @@ static struct usb_serial_driver pl2303_d
.id_table = id_table,
.usb_driver = &pl2303_driver,
.num_ports = 1,
diff --git a/usb/usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch b/usb/usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch
index 18499c1509a3ef..aa29990d68a921 100644
--- a/usb/usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch
+++ b/usb/usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch
@@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
-@@ -1169,6 +1169,7 @@ static struct usb_serial_driver pl2303_d
+@@ -1170,6 +1170,7 @@ static struct usb_serial_driver pl2303_d
.id_table = id_table,
.usb_driver = &pl2303_driver,
.num_ports = 1,
diff --git a/usb/usb-pl2303-switch-to-generic-read-implementation.patch b/usb/usb-pl2303-switch-to-generic-read-implementation.patch
index 875bad4cf9b079..1fea596c31bcef 100644
--- a/usb/usb-pl2303-switch-to-generic-read-implementation.patch
+++ b/usb/usb-pl2303-switch-to-generic-read-implementation.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
-@@ -769,10 +769,8 @@ static int pl2303_open(struct tty_struct
+@@ -770,10 +770,8 @@ static int pl2303_open(struct tty_struct
pl2303_set_termios(tty, port, &tmp_termios);
dbg("%s - submitting read urb", __func__);
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
pl2303_close(port);
return -EPROTO;
}
-@@ -1036,13 +1034,31 @@ exit:
+@@ -1037,13 +1035,31 @@ exit:
__func__, retval);
}
@@ -67,7 +67,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* break takes precedence over parity, */
/* which takes precedence over framing errors */
if (line_status & UART_BREAK_ERROR)
-@@ -1060,63 +1076,13 @@ static void pl2303_push_data(struct tty_
+@@ -1061,63 +1077,13 @@ static void pl2303_push_data(struct tty_
if (tty_flag == TTY_NORMAL && !(port->port.console && port->sysrq))
tty_insert_flip_string(tty, data, urb->actual_length);
else {
@@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
static void pl2303_write_bulk_callback(struct urb *urb)
-@@ -1181,7 +1147,7 @@ static struct usb_serial_driver pl2303_d
+@@ -1182,7 +1148,7 @@ static struct usb_serial_driver pl2303_d
.set_termios = pl2303_set_termios,
.tiocmget = pl2303_tiocmget,
.tiocmset = pl2303_tiocmset,
diff --git a/usb/usb-pl2303-switch-to-generic-write-implementation.patch b/usb/usb-pl2303-switch-to-generic-write-implementation.patch
index 74c0faf434af11..9d2b36546b791a 100644
--- a/usb/usb-pl2303-switch-to-generic-write-implementation.patch
+++ b/usb/usb-pl2303-switch-to-generic-write-implementation.patch
@@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static const struct usb_device_id id_table[] = {
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID) },
{ USB_DEVICE(PL2303_VENDOR_ID, PL2303_PRODUCT_ID_RSAQ2) },
-@@ -156,173 +146,12 @@ enum pl2303_type {
+@@ -157,173 +147,12 @@ enum pl2303_type {
struct pl2303_private {
spinlock_t lock;
@@ -210,7 +210,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int pl2303_vendor_read(__u16 value, __u16 index,
struct usb_serial *serial, unsigned char *buf)
{
-@@ -371,11 +200,6 @@ static int pl2303_startup(struct usb_ser
+@@ -372,11 +201,6 @@ static int pl2303_startup(struct usb_ser
if (!priv)
goto cleanup;
spin_lock_init(&priv->lock);
@@ -222,7 +222,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
init_waitqueue_head(&priv->delta_msr_wait);
priv->type = type;
usb_set_serial_port_data(serial->port[i], priv);
-@@ -403,7 +227,6 @@ cleanup:
+@@ -404,7 +228,6 @@ cleanup:
kfree(buf);
for (--i; i >= 0; --i) {
priv = usb_get_serial_port_data(serial->port[i]);
@@ -230,7 +230,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
kfree(priv);
usb_set_serial_port_data(serial->port[i], NULL);
}
-@@ -421,102 +244,6 @@ static int set_control_lines(struct usb_
+@@ -422,102 +245,6 @@ static int set_control_lines(struct usb_
return retval;
}
@@ -333,7 +333,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static void pl2303_set_termios(struct tty_struct *tty,
struct usb_serial_port *port, struct ktermios *old_termios)
{
-@@ -728,15 +455,14 @@ static void pl2303_dtr_rts(struct usb_se
+@@ -729,15 +456,14 @@ static void pl2303_dtr_rts(struct usb_se
static void pl2303_close(struct usb_serial_port *port)
{
@@ -352,7 +352,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* shutdown our urbs */
dbg("%s - shutting down urbs", __func__);
-@@ -950,10 +676,7 @@ static void pl2303_release(struct usb_se
+@@ -951,10 +677,7 @@ static void pl2303_release(struct usb_se
for (i = 0; i < serial->num_ports; ++i) {
priv = usb_get_serial_port_data(serial->port[i]);
@@ -364,7 +364,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
}
}
-@@ -1085,47 +808,6 @@ static void pl2303_process_read_urb(stru
+@@ -1086,47 +809,6 @@ static void pl2303_process_read_urb(stru
tty_kref_put(tty);
}
@@ -412,7 +412,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* All of the device info needed for the PL2303 SIO serial converter */
static struct usb_serial_driver pl2303_device = {
.driver = {
-@@ -1141,7 +823,6 @@ static struct usb_serial_driver pl2303_d
+@@ -1142,7 +824,6 @@ static struct usb_serial_driver pl2303_d
.close = pl2303_close,
.dtr_rts = pl2303_dtr_rts,
.carrier_raised = pl2303_carrier_raised,
@@ -420,7 +420,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
.ioctl = pl2303_ioctl,
.break_ctl = pl2303_break_ctl,
.set_termios = pl2303_set_termios,
-@@ -1149,9 +830,6 @@ static struct usb_serial_driver pl2303_d
+@@ -1150,9 +831,6 @@ static struct usb_serial_driver pl2303_d
.tiocmset = pl2303_tiocmset,
.process_read_urb = pl2303_process_read_urb,
.read_int_callback = pl2303_read_int_callback,
diff --git a/usb/usb-pl2303-use-generic-close.patch b/usb/usb-pl2303-use-generic-close.patch
index db07b764eed74b..705114ccd7d3d0 100644
--- a/usb/usb-pl2303-use-generic-close.patch
+++ b/usb/usb-pl2303-use-generic-close.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
-@@ -455,21 +455,10 @@ static void pl2303_dtr_rts(struct usb_se
+@@ -456,21 +456,10 @@ static void pl2303_dtr_rts(struct usb_se
static void pl2303_close(struct usb_serial_port *port)
{
diff --git a/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch b/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch
index ce68561fe38686..714f88a1a0ceef 100644
--- a/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch
+++ b/usb/usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch
@@ -89,7 +89,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
port->sysrq = 0;
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
-@@ -1057,7 +1057,7 @@ static void pl2303_push_data(struct tty_
+@@ -1058,7 +1058,7 @@ static void pl2303_push_data(struct tty_
if (line_status & UART_OVERRUN_ERROR)
tty_insert_flip_char(tty, 0, TTY_OVERRUN);