[PATCH 0/2] Series short description

[PATCH 0/2] Series short description

[Alan Cox]

A pair of small fixes for nasty console related bugs from the various tty
merges and updates.

Alan

[PATCH 1/2] drivers/char/tty_io.c: Avoid panic when no console is configured.

[Alan Cox]

From: \"Will Newton\" <will.newton@gmail.com>

When no console is configured tty_open tries to call kref_get on a NULL
pointer, return ENODEV instead.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/char/tty_io.c |   15 +++++++++------
 1 files changed, 9 insertions(+), 6 deletions(-)


diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 966be86..ac73fd9 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1793,12 +1793,15 @@ retry_open:
 	}
 #endif
 	if (device == MKDEV(TTYAUX_MAJOR, 1)) {
-		driver = tty_driver_kref_get(console_device(&index));
-		if (driver) {
-			/* Don't let /dev/console block */
-			filp->f_flags |= O_NONBLOCK;
-			noctty = 1;
-			goto got_driver;
+		struct tty_driver *console_driver = console_device(&index);
+		if (console_driver) {
+			driver = tty_driver_kref_get(console_driver);
+			if (driver) {
+				/* Don't let /dev/console block */
+				filp->f_flags |= O_NONBLOCK;
+				noctty = 1;
+				goto got_driver;
+			}
 		}
 		mutex_unlock(&tty_mutex);
 		return -ENODEV;

[PATCH 2/2] Add kref to fake tty used by USB console

[Alan Cox]

From: Kevin Hao <kexin.hao@windriver.com>

We alloc a fake tty in usb serial console setup function. we should
init the tty's kref otherwise we will face WARN_ON after following
invoke of tty_port_tty_set --> tty_kref_get.

Signed-off-by: Kevin Hao <kexin.hao@windriver.com>
Signed-off-by: Alan Cox <alan@redhat.com>
---

 drivers/usb/serial/console.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index 5b20de1..5b95009 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -135,6 +135,7 @@ static int usb_console_setup(struct console *co, char *options)
 				err("no more memory");
 				goto reset_open_count;
 			}
+			kref_init(&tty->kref);
 			termios = kzalloc(sizeof(*termios), GFP_KERNEL);
 			if (!termios) {
 				retval = -ENOMEM;

[PATCH 0/2] Series short description

[Alan Cox]

Next couple of fixes. The pty one is a bit more dramatic than I wanted for
an -rc release but it actually fixes the problem and at this point seems lower
risk than trying to botch up the existing code temporarily.

Having applied thar you can also then revert
a6540f731d506d9e82444cf0020e716613d4c46c

There are some USB patches to follow to fix various messes caused by sysrq
changes (serious performance regression and a kref leak) but I want those in
-next for a few days first.

---

Alan Cox (2):
      tty: maintainers data was edited wrongly by someone
      pty: Rework the pty layer to use the normal buffering logic


 MAINTAINERS        |   10 ++-
 drivers/char/pty.c |  156 ++++++++++++++++++++--------------------------------
 2 files changed, 65 insertions(+), 101 deletions(-)

-- 
My telephone support is a table

[PATCH 0/2] Series short description

[Alan Cox]

Fix up a couple of leaks that were reported ages ago and forgotten about

---

Alan Cox (2):
      arm: fix leak in iop13xx/pci
      arm: twl4030 - leak fix


 arch/arm/mach-iop13xx/pci.c       |    5 ++++-
 arch/arm/mach-omap2/mmc-twl4030.c |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

-- 
	"That was said by Eric Raymond who belongs to another movement" 
			- Richard Stallman

[PATCH 0/2] Series short description

[Alan Cox]

Various i8k updates got lost but have now been chased up, signed off and
this adds them to the tree.
---

Andy Spencer (1):
      i8k: Enable i8k on Dell Precision Systems

Federico Heinz (1):
      i8k: Add Dell Vostro systems


 drivers/char/i8k.c |   16 +++++++++++++++-
 1 files changed, 15 insertions(+), 1 deletions(-)

--