Message ID | 1265821399-29940-1-git-send-email-Aaro.Koskinen@nokia.com |
---|---|
State | New, archived |
Headers | show |
On Wed, 2010-02-10 at 19:03 +0200, Aaro.Koskinen@nokia.com wrote: > From: Aaro Koskinen <aaro.koskinen@nokia.com> > > Otherwise we may hang if we are called from panic() through mtdoops. > > Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> Pushed to my l2-mtd-2.6.git / master.
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 75f38b9..dfbab6c 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/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) {