From patchwork Thu Oct 1 15:16:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] OneNAND: OMAP: do not use DMA if oops in progress Date: Thu, 01 Oct 2009 05:16:56 -0000 From: Aaro Koskinen X-Patchwork-Id: 34733 Message-Id: <1254410216-24444-2-git-send-email-aaro.koskinen@nokia.com> To: linux-mtd@lists.infradead.org Cc: Artem.Bityutskiy@nokia.com, aaro.koskinen@nokia.com Otherwise we may hang if we are called from panic() through mtdoops. Signed-off-by: Aaro Koskinen --- drivers/mtd/onenand/omap2.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 0108ed4..b1e04ff 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -294,7 +294,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) { @@ -371,7 +371,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) {