From 0fe8efe7ca4dcd3e13489308d4b316dcb9370168 Mon Sep 17 00:00:00 2001 From: Miche Baker-Harvey Date: Wed, 5 Oct 2011 10:48:51 -0700 Subject: [PATCH] --- yaml --- r: 267348 b: refs/heads/master c: 361162459f62dc0826b82c9690a741a940f457f0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/tty/hvc/hvc_console.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 0c442b2d2e7c..4426eb31e728 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53d785ccd918d571c227d459477793872676fc02 +refs/heads/master: 361162459f62dc0826b82c9690a741a940f457f0 diff --git a/trunk/drivers/tty/hvc/hvc_console.c b/trunk/drivers/tty/hvc/hvc_console.c index b6b2d18fa38d..7430bc3c8d53 100644 --- a/trunk/drivers/tty/hvc/hvc_console.c +++ b/trunk/drivers/tty/hvc/hvc_console.c @@ -852,7 +852,7 @@ struct hvc_struct *hvc_alloc(uint32_t vtermno, int data, * find index to use: * see if this vterm id matches one registered for console. */ - for (i=0; i < MAX_NR_HVC_CONSOLES; i++) + for (i = 0; i < MAX_NR_HVC_CONSOLES; i++) if (vtermnos[i] == hp->vtermno && cons_ops[i] == hp->ops) break; @@ -862,9 +862,13 @@ struct hvc_struct *hvc_alloc(uint32_t vtermno, int data, i = ++last_hvc; hp->index = i; + hvc_console.index = i; + vtermnos[i] = vtermno; + cons_ops[i] = ops; list_add_tail(&(hp->next), &hvc_structs); spin_unlock(&hvc_structs_lock); + register_console(&hvc_console); return hp; } @@ -875,6 +879,7 @@ int hvc_remove(struct hvc_struct *hp) unsigned long flags; struct tty_struct *tty; + unregister_console(&hvc_console); spin_lock_irqsave(&hp->lock, flags); tty = tty_kref_get(hp->tty);