From 17e38ac8692c5c092e2a1c678e3d6c5757bd5f71 Mon Sep 17 00:00:00 2001 From: Daniel J Blueman Date: Wed, 29 Sep 2010 21:01:55 +0100 Subject: [PATCH] --- yaml --- r: 211141 b: refs/heads/master c: f12f662f29d5801e598c6bb4a71e54b2de218f72 h: refs/heads/master i: 211139: b5c6382fc24060e53e6e174c81a1f585e2ae32a4 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/omap2.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67184d2648bd..46bbe5b6596a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 899611ee7d373e5eeda08e9a8632684e1ebbbf00 +refs/heads/master: f12f662f29d5801e598c6bb4a71e54b2de218f72 diff --git a/trunk/drivers/mtd/nand/omap2.c b/trunk/drivers/mtd/nand/omap2.c index 133d51528f8d..513e0a76a4a7 100644 --- a/trunk/drivers/mtd/nand/omap2.c +++ b/trunk/drivers/mtd/nand/omap2.c @@ -413,7 +413,7 @@ static inline int omap_nand_dma_transfer(struct mtd_info *mtd, void *addr, prefetch_status = gpmc_read_status(GPMC_PREFETCH_COUNT); } while (prefetch_status); /* disable and stop the PFPW engine */ - gpmc_prefetch_reset(); + gpmc_prefetch_reset(info->gpmc_cs); dma_unmap_single(&info->pdev->dev, dma_addr, len, dir); return 0;