diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-12 08:40:19 -0700 |
| commit | 1c89ac55017f982355c7761e1c912c88c941483d (patch) | |
| tree | 6878e95a0572defc725ea58f5a1449db937a5066 /drivers/char | |
| parent | 88fa08f67bee1a0c765237bdac106a32872f57d2 (diff) | |
| parent | b1b135c8d619cb2c7045d6ee4e48375882518bb5 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
fix spinlock recursion in hvc_console
stop_machine: remove unused variable
modules: extend initcall_debug functionality to the module loader
export virtio_rng.h
lguest: use get_user_pages_fast() instead of get_user_pages()
mm: Make generic weak get_user_pages_fast and EXPORT_GPL it
lguest: don't set MAC address for guest unless specified
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/hvc_console.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index 02aac104842d..fd64137b1ab9 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c @@ -322,11 +322,10 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) hp->tty = tty; - if (hp->ops->notifier_add) - rc = hp->ops->notifier_add(hp, hp->data); - spin_unlock_irqrestore(&hp->lock, flags); + if (hp->ops->notifier_add) + rc = hp->ops->notifier_add(hp, hp->data); /* * If the notifier fails we return an error. The tty layer |