1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 7053d6333692..59f472143f08 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -2850,7 +2850,7 @@ struct device *tty_register_device(struct tty_driver *driver, unsigned index,
         else
                 tty_line_name(driver, index, name);
 
-        return device_create_drvdata(tty_class, device, dev, NULL, name);
+        return device_create(tty_class, device, dev, NULL, name);
 }
 EXPORT_SYMBOL(tty_register_device);
 
@@ -3032,11 +3032,12 @@ EXPORT_SYMBOL(tty_devnum);
 
 void proc_clear_tty(struct task_struct *p)
 {
+        unsigned long flags;
         struct tty_struct *tty;
-        spin_lock_irq(&p->sighand->siglock);
+        spin_lock_irqsave(&p->sighand->siglock, flags);
         tty = p->signal->tty;
         p->signal->tty = NULL;
-        spin_unlock_irq(&p->sighand->siglock);
+        spin_unlock_irqrestore(&p->sighand->siglock, flags);
         tty_kref_put(tty);
 }