diff --git a/[refs] b/[refs] index 9b76bb179a97..cf7de38396b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06e6d290ac7a9fb6fcec3a2207988163709f06aa +refs/heads/master: 87fd7724d4022913ae8dbee3ed55cd04f2c316a6 diff --git a/trunk/drivers/char/hvc_console.c b/trunk/drivers/char/hvc_console.c index dbee8bed0530..1d1bd34b7f12 100644 --- a/trunk/drivers/char/hvc_console.c +++ b/trunk/drivers/char/hvc_console.c @@ -320,10 +320,8 @@ static int hvc_open(struct tty_struct *tty, struct file * filp) struct kobject *kobjp; /* Auto increments kobject reference if found. */ - if (!(hp = hvc_get_by_index(tty->index))) { - printk(KERN_WARNING "hvc_console: tty open failed, no vty associated with tty.\n"); + if (!(hp = hvc_get_by_index(tty->index))) return -ENODEV; - } spin_lock_irqsave(&hp->lock, flags); /* Check and then increment for fast path open. */