Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index ba55bba151b9..35cca4c7fb18 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -38,6 +38,7 @@
 #include <linux/spinlock.h>
 #include <linux/delay.h>
 #include <linux/freezer.h>
+#include <linux/slab.h>
 
 #include <asm/uaccess.h>
 
@@ -367,16 +368,12 @@ static void hvc_close(struct tty_struct *tty, struct file * filp)
         hp = tty->driver_data;
 
         spin_lock_irqsave(&hp->lock, flags);
-        tty_kref_get(tty);
 
         if (--hp->count == 0) {
                 /* We are done with the tty pointer now. */
                 hp->tty = NULL;
                 spin_unlock_irqrestore(&hp->lock, flags);
 
-                /* Put the ref obtained in hvc_open() */
-                tty_kref_put(tty);
-
                 if (hp->ops->notifier_del)
                         hp->ops->notifier_del(hp, hp->data);