diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-05 10:59:25 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-05 10:59:25 -0800 |
| commit | f878c4f193b7327244af8f7de8cf8bc61fb78fe1 (patch) | |
| tree | 0d95465d5a6a8f13259bc149b249f29501e7fb75 /tty | |
| parent | 39874450fa07821078746db7b99cc931ca9478cc (diff) | |
| download | patches-f878c4f193b7327244af8f7de8cf8bc61fb78fe1.tar.gz | |
some bugfixes for .32
Diffstat (limited to 'tty')
| -rw-r--r-- | tty/tty_port-add-tty_port_open-helper.patch | 2 | ||||
| -rw-r--r-- | tty/tty_port-coding-style-cleaning-pass.patch | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/tty/tty_port-add-tty_port_open-helper.patch b/tty/tty_port-add-tty_port_open-helper.patch index 968fa62f0458f4..ca38f0e7f9695a 100644 --- a/tty/tty_port-add-tty_port_open-helper.patch +++ b/tty/tty_port-add-tty_port_open-helper.patch @@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -375,3 +376,36 @@ void tty_port_close(struct tty_port *por +@@ -378,3 +379,36 @@ void tty_port_close(struct tty_port *por tty_port_tty_set(port, NULL); } EXPORT_SYMBOL(tty_port_close); diff --git a/tty/tty_port-coding-style-cleaning-pass.patch b/tty/tty_port-coding-style-cleaning-pass.patch index 8c322f6308d063..d28a7357453e50 100644 --- a/tty/tty_port-coding-style-cleaning-pass.patch +++ b/tty/tty_port-coding-style-cleaning-pass.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> int tty_port_block_til_ready(struct tty_port *port, struct tty_struct *tty, struct file *filp) { -@@ -248,7 +248,8 @@ int tty_port_block_til_ready(struct tty_ +@@ -251,7 +251,8 @@ int tty_port_block_til_ready(struct tty_ tty_port_raise_dtr_rts(port); prepare_to_wait(&port->open_wait, &wait, TASK_INTERRUPTIBLE); @@ -38,7 +38,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (tty_hung_up_p(filp) || !(port->flags & ASYNC_INITIALIZED)) { if (port->flags & ASYNC_HUP_NOTIFY) retval = -EAGAIN; -@@ -280,11 +281,11 @@ int tty_port_block_til_ready(struct tty_ +@@ -283,11 +284,11 @@ int tty_port_block_til_ready(struct tty_ port->flags |= ASYNC_NORMAL_ACTIVE; spin_unlock_irqrestore(&port->lock, flags); return retval; @@ -52,7 +52,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { unsigned long flags; -@@ -294,7 +295,7 @@ int tty_port_close_start(struct tty_port +@@ -297,7 +298,7 @@ int tty_port_close_start(struct tty_port return 0; } @@ -61,7 +61,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> printk(KERN_WARNING "tty_port_close_start: tty->count = 1 port count = %d.\n", port->count); -@@ -326,8 +327,8 @@ int tty_port_close_start(struct tty_port +@@ -329,8 +330,8 @@ int tty_port_close_start(struct tty_port long timeout; if (bps > 1200) @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> else timeout = 2 * HZ; schedule_timeout_interruptible(timeout); -@@ -378,7 +379,7 @@ void tty_port_close(struct tty_port *por +@@ -381,7 +382,7 @@ void tty_port_close(struct tty_port *por EXPORT_SYMBOL(tty_port_close); int tty_port_open(struct tty_port *port, struct tty_struct *tty, @@ -81,7 +81,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { spin_lock_irq(&port->lock); if (!tty_hung_up_p(filp)) -@@ -398,10 +399,10 @@ int tty_port_open(struct tty_port *port, +@@ -401,10 +402,10 @@ int tty_port_open(struct tty_port *port, if (port->ops->activate) { int retval = port->ops->activate(port, tty); if (retval) { |