summaryrefslogtreecommitdiffstats
path: root/drivers/mtd
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@nokia.com>2009-03-04 09:53:40 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-03-20 18:39:25 +0000
commit48ec00ac895074f8a47bda8f3925ccaa46abb7a8 (patch)
treeed31424afc0b44d209185ff24e0852d9e321f86d /drivers/mtd
parente2a0f25b4f520adbd82c0caafcde0470ed11053d (diff)
downloadlinux-stable-48ec00ac895074f8a47bda8f3925ccaa46abb7a8.tar.gz
linux-stable-48ec00ac895074f8a47bda8f3925ccaa46abb7a8.tar.bz2
linux-stable-48ec00ac895074f8a47bda8f3925ccaa46abb7a8.zip
[MTD] mtdoops: fix a bit of spin lock usage
- do not leave spin lock locked - initialise spin lock Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> Acked-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/mtd')
-rw-r--r--drivers/mtd/mtdoops.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/mtd/mtdoops.c b/drivers/mtd/mtdoops.c
index fdf504fb319a..1060337c06df 100644
--- a/drivers/mtd/mtdoops.c
+++ b/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");