From d4a7ff27ba5b32bbfce1929d2bf017969f267d41 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 10 Feb 2010 19:03:19 +0200 Subject: [PATCH] --- yaml --- r: 195877 b: refs/heads/master c: 932f5d21ccd2705f1fb22e8a9e0da42013dcee17 h: refs/heads/master i: 195875: 9dc574b2bd67616ea62ed15546e5197c798c4f7c v: v3 --- [refs] | 2 +- trunk/drivers/mtd/onenand/omap2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6830c99e9687..a22373526cd3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d70f334ad2bf1b3aaa1f0699c0f442e14bcc9e0 +refs/heads/master: 932f5d21ccd2705f1fb22e8a9e0da42013dcee17 diff --git a/trunk/drivers/mtd/onenand/omap2.c b/trunk/drivers/mtd/onenand/omap2.c index 75f38b95811e..dfbab6c72b74 100644 --- a/trunk/drivers/mtd/onenand/omap2.c +++ b/trunk/drivers/mtd/onenand/omap2.c @@ -308,7 +308,7 @@ static int omap3_onenand_read_bufferram(struct mtd_info *mtd, int area, goto out_copy; /* panic_write() may be in an interrupt context */ - if (in_interrupt()) + if (in_interrupt() || oops_in_progress) goto out_copy; if (buf >= high_memory) { @@ -385,7 +385,7 @@ static int omap3_onenand_write_bufferram(struct mtd_info *mtd, int area, goto out_copy; /* panic_write() may be in an interrupt context */ - if (in_interrupt()) + if (in_interrupt() || oops_in_progress) goto out_copy; if (buf >= high_memory) {