diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:51:23 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-09-15 15:51:23 -0700 |
| commit | f9752c181c0f7d8bc9c16df0124bf06c5a4d4d88 (patch) | |
| tree | 0ac0d5b4f977e623ec95b0ad9ad7a867788f48d0 /usb | |
| parent | 11a64ddefcc57c4c57aee99ce0dde04d8de60155 (diff) | |
| download | patches-f9752c181c0f7d8bc9c16df0124bf06c5a4d4d88.tar.gz | |
tty mess :(
Diffstat (limited to 'usb')
3 files changed, 16 insertions, 16 deletions
diff --git a/usb/usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch b/usb/usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch index 6ec87ddef88b08..33facf2ceb093d 100644 --- a/usb/usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch +++ b/usb/usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -1220,15 +1220,19 @@ int usb_serial_suspend(struct usb_interf +@@ -1157,15 +1157,19 @@ int usb_serial_suspend(struct usb_interf serial->suspending = 1; diff --git a/usb/usb-usb-serial-remove-unused-variables.patch b/usb/usb-usb-serial-remove-unused-variables.patch index 4a933df58c7c95..2201c460d5156d 100644 --- a/usb/usb-usb-serial-remove-unused-variables.patch +++ b/usb/usb-usb-serial-remove-unused-variables.patch @@ -17,16 +17,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -297,8 +297,6 @@ bailout_serial_put: - static void serial_do_down(struct usb_serial_port *port) +@@ -292,8 +292,6 @@ static int serial_open(struct tty_struct + static void serial_down(struct usb_serial_port *port) { struct usb_serial_driver *drv = port->serial->type; - struct usb_serial *serial; - struct module *owner; - /* The console is magical, do not hang up the console hardware - or there will be tears */ -@@ -306,12 +304,8 @@ static void serial_do_down(struct usb_se + /* + * The console is magical. Do not hang up the console hardware +@@ -309,12 +307,8 @@ static void serial_down(struct usb_seria return; mutex_lock(&port->mutex); diff --git a/usb/usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch b/usb/usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch index 294052ca0f9469..b2dd4882305886 100644 --- a/usb/usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch +++ b/usb/usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch @@ -315,7 +315,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include "pl2303.h" /* -@@ -989,6 +990,10 @@ int usb_serial_probe(struct usb_interfac +@@ -625,6 +626,8 @@ static void port_release(struct device * + usb_free_urb(port->write_urb); + usb_free_urb(port->interrupt_in_urb); + usb_free_urb(port->interrupt_out_urb); ++ if (!IS_ERR(port->write_fifo) && port->write_fifo) ++ kfifo_free(port->write_fifo); + kfree(port->bulk_in_buffer); + kfree(port->bulk_out_buffer); + kfree(port->interrupt_in_buffer); +@@ -964,6 +967,10 @@ int usb_serial_probe(struct usb_interfac dev_err(&interface->dev, "No free urbs available\n"); goto probe_error; } @@ -326,15 +335,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> buffer_size = le16_to_cpu(endpoint->wMaxPacketSize); port->bulk_out_size = buffer_size; port->bulk_out_endpointAddress = endpoint->bEndpointAddress; -@@ -1133,6 +1138,8 @@ probe_error: - port = serial->port[i]; - if (!port) - continue; -+ if (!IS_ERR(port->write_fifo) && port->write_fifo) -+ kfifo_free(port->write_fifo); - usb_free_urb(port->write_urb); - kfree(port->bulk_out_buffer); - } --- a/include/linux/usb/serial.h +++ b/include/linux/usb/serial.h @@ -59,6 +59,7 @@ enum port_dev_state { |