From d9e012c8f777337022672c41e53912c4623f8014 Mon Sep 17 00:00:00 2001 From: Adrian Hunter Date: Wed, 4 Mar 2009 09:53:40 +0200 Subject: [PATCH] --- yaml --- r: 142313 b: refs/heads/master c: 48ec00ac895074f8a47bda8f3925ccaa46abb7a8 h: refs/heads/master i: 142311: 0ba8eebc0d7d30d99c274c681817c9a166e27e1b v: v3 --- [refs] | 2 +- trunk/drivers/mtd/mtdoops.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a31f29086fe8..770fbd23be41 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e2a0f25b4f520adbd82c0caafcde0470ed11053d +refs/heads/master: 48ec00ac895074f8a47bda8f3925ccaa46abb7a8 diff --git a/trunk/drivers/mtd/mtdoops.c b/trunk/drivers/mtd/mtdoops.c index fdf504fb319a..1060337c06df 100644 --- a/trunk/drivers/mtd/mtdoops.c +++ b/trunk/drivers/mtd/mtdoops.c @@ -361,8 +361,10 @@ mtdoops_console_write(struct console *co, const char *s, unsigned int count) spin_lock_irqsave(&cxt->writecount_lock, flags); /* Check ready status didn't change whilst waiting for the lock */ - if (!cxt->ready) + if (!cxt->ready) { + spin_unlock_irqrestore(&cxt->writecount_lock, flags); return; + } if (cxt->writecount == 0) { u32 *stamp = cxt->oops_buf; @@ -420,6 +422,7 @@ static int __init mtdoops_console_init(void) cxt->mtd_index = -1; cxt->oops_buf = vmalloc(OOPS_PAGE_SIZE); + spin_lock_init(&cxt->writecount_lock); if (!cxt->oops_buf) { printk(KERN_ERR "Failed to allocate mtdoops buffer workspace\n");